On 3 May 2016 at 12:33, <pmoua...@apache.org> wrote: > Author: pmouawad > Date: Tue May 3 11:33:46 2016 > New Revision: 1742100 > > URL: http://svn.apache.org/viewvc?rev=1742100&view=rev > Log: > Report generation : Better defaults > filters_only_sample_series must be true to avoid empty graphs > > Modified: > jmeter/trunk/bin/jmeter.properties > jmeter/trunk/bin/user.properties > > jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java > jmeter/trunk/xdocs/usermanual/generating-dashboard.xml > jmeter/trunk/xdocs/usermanual/properties_reference.xml > > Modified: jmeter/trunk/bin/jmeter.properties > URL: > http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1742100&r1=1742099&r2=1742100&view=diff > ============================================================================== > --- jmeter/trunk/bin/jmeter.properties (original) > +++ jmeter/trunk/bin/jmeter.properties Tue May 3 11:33:46 2016 > @@ -1286,8 +1286,10 @@ jmeter.reportgenerator.exporter.html.cla > # Empty value means no filtering > #jmeter.reportgenerator.exporter.html.series_filter= > > -# Indicates whether series filter apply only on sample series > -#jmeter.reportgenerator.exporter.html.filters_only_sample_series=false > +# Indicates whether series filter apply only on sample series or to all > series > +# setting this to false can lead to empty graphs if series_filter does not > +# contain required series > +#jmeter.reportgenerator.exporter.html.filters_only_sample_series=true > > # Indicates whether only controller samples are displayed on graphs that > support it. > #jmeter.reportgenerator.exporter.html.show_controllers_only=false > > Modified: jmeter/trunk/bin/user.properties > URL: > http://svn.apache.org/viewvc/jmeter/trunk/bin/user.properties?rev=1742100&r1=1742099&r2=1742100&view=diff > ============================================================================== > --- jmeter/trunk/bin/user.properties (original) > +++ jmeter/trunk/bin/user.properties Tue May 3 11:33:46 2016 > @@ -101,9 +101,7 @@ > # on the result > > #jmeter.reportgenerator.exporter.html.series_filter=((^Sample1)|(^Sample2))(-success|-failure)? > > - > -# Indicates whether series filter apply only on sample series > -#jmeter.reportgenerator.exporter.html.filters_only_sample_series=false > - > # Indicates whether only controller samples are displayed on graphs that > support it. > #jmeter.reportgenerator.exporter.html.show_controllers_only=false > + > +jmeter.save.saveservice.timestamp_format=dd/MM HH:mm:ss
-1 This is the wrong place to change the default for a property. And it is a breaking change that has not been discussed. Perhaps it was not intentional, as the change is not documented in the log message nor in changes.xml In any case, this part of the commit needs to be reverted. > \ No newline at end of file > > Modified: > jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java > URL: > http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java?rev=1742100&r1=1742099&r2=1742100&view=diff > ============================================================================== > --- > jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java > (original) > +++ > jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java > Tue May 3 11:33:46 2016 > @@ -87,7 +87,7 @@ public class ReportGeneratorConfiguratio > // Required exporter properties > // Filters only sample series ? > public static final String EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES = > "filters_only_sample_series"; > - public static final Boolean > EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES_DEFAULT = Boolean.FALSE; > + public static final Boolean > EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES_DEFAULT = Boolean.TRUE; > > // Series filter > public static final String EXPORTER_KEY_SERIES_FILTER = "series_filter"; > > Modified: jmeter/trunk/xdocs/usermanual/generating-dashboard.xml > URL: > http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/generating-dashboard.xml?rev=1742100&r1=1742099&r2=1742100&view=diff > ============================================================================== > --- jmeter/trunk/xdocs/usermanual/generating-dashboard.xml (original) > +++ jmeter/trunk/xdocs/usermanual/generating-dashboard.xml Tue May 3 > 11:33:46 2016 > @@ -225,7 +225,7 @@ jmeter.save.saveservice.timestamp_format > <property name="filters_only_sample_series" > required="No"> > Defines whether <code>series_filter</code> > (see below) > apply only on sample series. > - Default: <code>false</code></property> > + Default: <code>true</code></property> > <property name="series_filter" > required="No">Sets the filter > of series. An empty value deactivates the > filtering. > Format: regular expression. > > Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml > URL: > http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1742100&r1=1742099&r2=1742100&view=diff > ============================================================================== > --- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original) > +++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Tue May 3 > 11:33:46 2016 > @@ -687,7 +687,7 @@ log_level.org.apache.http.client=DEBUG > <property name="jmeter.reportgenerator.exporter.html.property.template_dir"> > Sets the source directory of templated files from which the html pages are > generated.<br/>, defaults to:report-template</property> > <property name="jmeter.reportgenerator.exporter.html.property.output_dir"> > Sets the destination directory for generated html pages.<br/> This will be > overriden by the command line option -o <br/>, defaults > to:report-output</property> > <property name="jmeter.reportgenerator.exporter.html.series_filter"> Regular > Expression which Indicates which graph series are filtered in display<br/> > Empty value means no filtering<br/>, defaults to:</property> > -<property > name="jmeter.reportgenerator.exporter.html.filters_only_sample_series"> > Indicates whether series filter apply only on sample series<br/>, defaults > to:false</property> > +<property > name="jmeter.reportgenerator.exporter.html.filters_only_sample_series"> > Indicates whether series filter apply only on sample series<br/>, defaults > to:true</property> > <property name="jmeter.reportgenerator.exporter.html.show_controllers_only"> > Indicates whether only controller samples are displayed on graphs that > support it.<br/>, defaults to:false</property> > </properties> > </section> > >
