OpenHAB
/
openhab-addons
mirror of https://github.com/openhab/openhab-addons.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[rrd4j] Corrected the default configurations (third try) (#8708) 

Applied the changes found by spotless.

According the comments DEFAULT_NUMERIC, DEFAULT_QUANTIFIABLE config should have 5 archives, the 4th was missing. Additionally the ConsolFunction changed in the DEFAULT_QUANTIFIABLE.
The DEFAULT_OTHER config had false computed archives.

Signed-off-by: Jürgen Baginski <opus42@gmx.de>
pull/8719/head
Jürgen Baginski 2020-10-09 20:45:16 +02:00 committed by GitHub
parent bf72bd2ce3
commit 8eab7b6331
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java
View File

@ -367,7 +367,8 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {
// 3. granularity of 15m for the last year // 3. granularity of 15m for the last year
// 4. granularity of 1h for the last 5 years // 4. granularity of 1h for the last 5 years
// 5. granularity of 1d for the last 10 years // 5. granularity of 1d for the last 10 years
defaultNumeric.addArchives("LAST,0.5,1,360:LAST,0.5,6,10080:LAST,0.5,90,36500:LAST,0.5,360,43800:LAST,0.5,8640,3650"); defaultNumeric
.addArchives("LAST,0.5,1,360:LAST,0.5,6,10080:LAST,0.5,90,36500:LAST,0.5,360,43800:LAST,0.5,8640,3650");
rrdDefs.put(DEFAULT_NUMERIC, defaultNumeric); rrdDefs.put(DEFAULT_NUMERIC, defaultNumeric);
RrdDefConfig defaultQuantifiable = new RrdDefConfig(DEFAULT_QUANTIFIABLE); RrdDefConfig defaultQuantifiable = new RrdDefConfig(DEFAULT_QUANTIFIABLE);
@ -379,7 +380,8 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {
// 3. granularity of 15m for the last year // 3. granularity of 15m for the last year
// 4. granularity of 1h for the last 5 years // 4. granularity of 1h for the last 5 years
// 5. granularity of 1d for the last 10 years // 5. granularity of 1d for the last 10 years
defaultQuantifiable.addArchives("AVERAGE,0.5,1,360:AVERAGE,0.5,6,10080:AVERAGE,0.5,90,36500:AVERAGE,0.5,360,43800:AVERAGE,0.5,8640,3650"); defaultQuantifiable.addArchives(
"AVERAGE,0.5,1,360:AVERAGE,0.5,6,10080:AVERAGE,0.5,90,36500:AVERAGE,0.5,360,43800:AVERAGE,0.5,8640,3650");
rrdDefs.put(DEFAULT_QUANTIFIABLE, defaultQuantifiable); rrdDefs.put(DEFAULT_QUANTIFIABLE, defaultQuantifiable);
RrdDefConfig defaultOther = new RrdDefConfig(DEFAULT_OTHER); RrdDefConfig defaultOther = new RrdDefConfig(DEFAULT_OTHER);