You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/09/02 19:36:45 UTC
svn commit: r1759023 - in /jmeter/trunk: bin/user.properties
src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
xdocs/usermanual/generating-dashboard.xml
Author: pmouawad
Date: Fri Sep 2 19:36:44 2016
New Revision: 1759023
URL: http://svn.apache.org/viewvc?rev=1759023&view=rev
Log:
Bug 59956 - Web Report / Dashboard : Add ability to generate a graph for a range of data
Replace date format by one without separator for easier use from command line
Bugzilla Id: 59956
Modified:
jmeter/trunk/bin/user.properties
jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
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=1759023&r1=1759022&r2=1759023&view=diff
==============================================================================
--- jmeter/trunk/bin/user.properties (original)
+++ jmeter/trunk/bin/user.properties Fri Sep 2 19:36:44 2016
@@ -77,9 +77,9 @@
#jmeter.reportgenerator.report_title=Apache JMeter Dashboard
# Used to generate a report based on a date range if needed
-# Date range start date at format dd/MM/yyyy HH:mm:ss
+# Date range start date at format yyyyMMddHHmmss
#jmeter.reportgenerator.start_date=
-# Date range end date at format dd/MM/yyyy HH:mm:ss
+# Date range end date at format yyyyMMddHHmmss
#jmeter.reportgenerator.end_date=
# Change this parameter if you want to change the granularity of over time graphs.
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=1759023&r1=1759022&r2=1759023&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 Fri Sep 2 19:36:44 2016
@@ -42,7 +42,7 @@ public class ReportGeneratorConfiguratio
private static final Logger LOG = LoggingManager.getLoggerForClass();
- private static final String DATE_FORMAT = "dd/MM/yyyy HH:mm:ss"; //$NON-NLS-1$
+ private static final String RANGE_DATE_FORMAT = "yyyyMMddHHmmss"; //$NON-NLS-1$
public static final char KEY_DELIMITER = '.';
public static final String REPORT_GENERATOR_KEY_PREFIX = "jmeter.reportgenerator";
@@ -634,7 +634,7 @@ public class ReportGeneratorConfiguratio
REPORT_GENERATOR_KEY_START_DATE, String.class);
final String endDateValue = getOptionalProperty(props,
REPORT_GENERATOR_KEY_END_DATE, String.class);
- SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
+ SimpleDateFormat dateFormat = new SimpleDateFormat(RANGE_DATE_FORMAT);
try {
if(!StringUtils.isEmpty(startDateValue)) {
reportStartDate = dateFormat.parse(startDateValue);
@@ -642,7 +642,7 @@ public class ReportGeneratorConfiguratio
}
} catch (ParseException e) {
LOG.error("Error parsing property 'REPORT_GENERATOR_KEY_START_DATE' with value:" + startDateValue
- +" using format:"+DATE_FORMAT, e);
+ +" using format:"+RANGE_DATE_FORMAT, e);
}
try {
if(!StringUtils.isEmpty(endDateValue)) {
@@ -651,7 +651,7 @@ public class ReportGeneratorConfiguratio
}
} catch (ParseException e) {
LOG.error("Error parsing property 'REPORT_GENERATOR_KEY_START_DATE' with value:" + endDateValue
- +" using format:"+DATE_FORMAT, e);
+ +" using format:"+RANGE_DATE_FORMAT, e);
}
LOG.info("Will use date range start date: "+startDateValue+", end date: "+endDateValue);
Modified: jmeter/trunk/xdocs/usermanual/generating-dashboard.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/generating-dashboard.xml?rev=1759023&r1=1759022&r2=1759023&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/generating-dashboard.xml (original)
+++ jmeter/trunk/xdocs/usermanual/generating-dashboard.xml Fri Sep 2 19:36:44 2016
@@ -110,12 +110,12 @@ jmeter.save.saveservice.timestamp_format
</property>
<property name="start_date" required="No">
Start date of the range of data to use for report.
- Date format is <code>dd/MM/yyyy HH:mm:ss</code>
+ Date format is <code>yyyyMMddHHmmss</code>
Default: not filled which means data range will be used from the begining
</property>
<property name="end_date" required="No">
End date of the range of data to use for report.
- Date format is <code>dd/MM/yyyy HH:mm:ss</code>
+ Date format is <code>yyyyMMddHHmmss</code>
Default: not filled which means data range will be used until the end
</property>
<property name="overall_granularity" required="No">