Corrected the default configurations

According the comments DEFAULT_NUMERIC, DEFAULT_QUANTIFIABLE config should have 5 archives, the #4 was missing. Additionally the ConsolFunction changed in the DEFAULT_QUANTIFIABLE. The DEFAULT_OTHER config had false computed archives. Signed-off-by: Jürgen Baginski [email protected]
openhab · Oct 8, 2020 · ac0da15 · ac0da15
1 parent 937c7a3
commit ac0da15
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...e.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java b/...e.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java
@@ -367,7 +367,7 @@ public void activate(final Map<String, Object> config) {
         // 3. granularity of 15m for the last year
         // 4. granularity of 1h for the last 5 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,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);
 
         RrdDefConfig defaultQuantifiable = new RrdDefConfig(DEFAULT_QUANTIFIABLE);
@@ -380,7 +380,7 @@ public void activate(final Map<String, Object> config) {
         // 4. granularity of 1h for the last 5 years
         // 5. granularity of 1d for the last 10 years
         defaultQuantifiable
-                .addArchives("AVERAGE,0.5,1,360:AVERAGE,0.5,6,10080:LAST,0.5,90,36500:AVERAGE,0.5,8640,3650");
+                .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);
 
         RrdDefConfig defaultOther = new RrdDefConfig(DEFAULT_OTHER);
@@ -391,7 +391,7 @@ public void activate(final Map<String, Object> config) {
         // 2. granularity of 1m for the last week
         // 3. granularity of 15m for the last year
         // 4. granularity of 4h for the last 10 years
-        defaultOther.addArchives("LAST,0.5,1,1440:LAST,0.5,12,10080:LAST,0.5,180,35040:LAST,0.5,240,21900");
+        defaultOther.addArchives("LAST,0.5,1,720:LAST,0.5,12,10080:LAST,0.5,180,35040:LAST,0.5,2880,21900");
         rrdDefs.put(DEFAULT_OTHER, defaultOther);
 
         if (config.isEmpty()) {