svn commit: r1783544 - in /jmeter/trunk: bin/user.properties xdocs/usermanual/generating-dashboard.xml

[fs...@apache.org]

Author: fschumacher
Date: Sat Feb 18 13:45:51 2017
New Revision: 1783544

URL: http://svn.apache.org/viewvc?rev=1783544&view=rev
Log:
Simplify regex for series_filter

Modified:
    jmeter/trunk/bin/user.properties
    jmeter/trunk/xdocs/usermanual/generating-dashboard.xml

Modified: jmeter/trunk/bin/user.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/user.properties?rev=1783544&r1=1783543&r2=1783544&view=diff
==============================================================================
--- jmeter/trunk/bin/user.properties (original)
+++ jmeter/trunk/bin/user.properties Sat Feb 18 13:45:51 2017
@@ -89,10 +89,10 @@
 
 # Indicates which graph series are filtered (regular expression)
 # In the below example we filter on Search and Order samples
-# Note that the end of the pattern should always include ((-success$|-failure$)|$)
+# Note that the end of the pattern should always include (-success|-failure)?$
 # TransactionsPerSecondGraphConsumer suffixes transactions with "-success" or "-failure" depending 
 # on the result
-#jmeter.reportgenerator.exporter.html.series_filter=((^Search)|(^Order))((-success$|-failure$)|$)
+#jmeter.reportgenerator.exporter.html.series_filter=^(Search|Order)(-success|-failure)?$
 
 # Indicates whether only controller samples are displayed on graphs that support it.
 #jmeter.reportgenerator.exporter.html.show_controllers_only=false

Modified: jmeter/trunk/xdocs/usermanual/generating-dashboard.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/generating-dashboard.xml?rev=1783544&r1=1783543&r2=1783544&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/generating-dashboard.xml (original)
+++ jmeter/trunk/xdocs/usermanual/generating-dashboard.xml Sat Feb 18 13:45:51 2017
@@ -286,7 +286,7 @@ jmeter.save.saveservice.timestamp_format
                                 Default: <code>true</code></property>
                             <property name="series_filter" required="No">Sets the filter
                                 of series. An empty value deactivates the filtering.
-                                If not empty, regex should end with <code>((-success$|-failure$)|$)</code><br/>
+                                If not empty, regex should end with <code>(-success|-failure)?$</code><br/>
                                 Format: regular expression.
                                 Default: ""
                             </property>
@@ -518,10 +518,10 @@ jmeter.reportgenerator.apdex_tolerated_t
 
 # Indicates which graph series are filtered (regular expression)
 # In the below example we filter on Search and Order samples
-# Note that the end of the pattern should always include (-success|-failure)? 
+# Note that the end of the pattern should always include (-success|-failure)?$
 # Transactions per second suffixes Transactions with "-success" or "-failure" depending 
 # on the result
-#jmeter.reportgenerator.exporter.html.series_filter=((^Search)|(^Order))(-success|-failure)?
+#jmeter.reportgenerator.exporter.html.series_filter=^(Search|Order)(-success|-failure)?$
 
 # Indicates whether series filter apply only on sample series
 jmeter.reportgenerator.exporter.html.filters_only_sample_series=true