diff --git a/README.md b/README.md index f74c232..0ba9e31 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,16 @@ Below are screenshots of the provided Grafana dashboards (found in the **doc/** ## Notes -### InfluxDB +### Start InfluxDB and Grafana at boot on RedHat 7+ + + systemctl enable influxdb + systemctl start influxdb + + systemctl enable grafana-server + systemctl start grafana-server + + +### InfluxDB Retention Policy Per default the *hmci* influx database has no retention policy, so data will be kept forever. It is recommended to set a retention policy, which is shown below. diff --git a/build.gradle b/build.gradle index 4332656..f0bdce6 100644 --- a/build.gradle +++ b/build.gradle @@ -16,22 +16,20 @@ repositories { } dependencies { - annotationProcessor 'info.picocli:picocli-codegen:4.5.2' - implementation 'info.picocli:picocli:4.5.2' + annotationProcessor 'info.picocli:picocli-codegen:4.6.0' + implementation 'info.picocli:picocli:4.6.0' implementation 'org.jsoup:jsoup:1.13.1' implementation 'com.squareup.okhttp3:okhttp:4.9.0' implementation 'com.squareup.moshi:moshi:1.11.0' implementation 'com.serjltt.moshi:moshi-lazy-adapters:2.2' implementation 'org.tomlj:tomlj:1.0.0' implementation 'org.influxdb:influxdb-java:2.21' - implementation 'org.slf4j:slf4j-api:1.7.+' - runtimeOnly 'ch.qos.logback:logback-classic:1.+' + implementation 'org.slf4j:slf4j-api:1.7.30' + runtimeOnly 'org.slf4j:slf4j-simple:1.7.30' testImplementation('org.spockframework:spock-core:2.0-M4-groovy-3.0') testImplementation('com.squareup.okhttp3:mockwebserver:4.9.0') testImplementation("org.slf4j:slf4j-simple:1.7.+") - //implementation platform('org.testcontainers:testcontainers-bom:1.14.3') //import bom - //testCompile "org.testcontainers:influxdb:1.14.3" } application { @@ -114,6 +112,7 @@ jar { 'Build-Version' : versioning.info.tag ?: (versioning.info.branch + "-" + versioning.info.build), 'Build-Revision' : versioning.info.commit, 'Build-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ss.SSSZ").toString(), + 'Add-Opens' : 'java.base/java.lang.invoke' // To ignore "Illegal reflective access by retrofit2.Platform" warnings ) } } diff --git a/gradle.properties b/gradle.properties index 09e0177..1acfe4d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ id = hmci group = biz.nellemann.hmci -version = 0.2.7 +version = 1.0.1 diff --git a/src/main/java/biz/nellemann/hmci/InfluxClient.java b/src/main/java/biz/nellemann/hmci/InfluxClient.java index b5c2e48..07be409 100644 --- a/src/main/java/biz/nellemann/hmci/InfluxClient.java +++ b/src/main/java/biz/nellemann/hmci/InfluxClient.java @@ -30,6 +30,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import static java.lang.Thread.sleep; + class InfluxClient { private final static Logger log = LoggerFactory.getLogger(InfluxClient.class); @@ -57,20 +59,33 @@ class InfluxClient { return; } - try { - log.debug("Connecting to InfluxDB - " + url); - influxDB = InfluxDBFactory.connect(url, username, password); - createDatabase(); + boolean connected = false; + int errors = 0; - // Enable batch writes to get better performance. - BatchOptions options = BatchOptions.DEFAULTS.actions(1000).flushDuration(5000).precision(TimeUnit.SECONDS); - influxDB.enableBatch(options); - batchPoints = BatchPoints.database(database).precision(TimeUnit.SECONDS).build(); + do { + try { + log.debug("Connecting to InfluxDB - " + url); + influxDB = InfluxDBFactory.connect(url, username, password); + createDatabase(); + + // Enable batch writes to get better performance. + BatchOptions options = BatchOptions.DEFAULTS.actions(1000).flushDuration(5000).precision(TimeUnit.SECONDS); + influxDB.enableBatch(options); + batchPoints = BatchPoints.database(database).precision(TimeUnit.SECONDS).build(); + + connected = true; + + } catch(Exception e) { + sleep(15*1000); + if(errors++ > 3) { + log.error("login() error, giving up - " + e.getMessage()); + throw new Exception(e); + } else { + log.warn("login() error, retrying - " + e.getMessage()); + } + } + } while(!connected); - } catch(Exception e) { - log.error("login() error - " + e.getMessage()); - throw new Exception(e); - } } diff --git a/src/main/java/biz/nellemann/hmci/Insights.java b/src/main/java/biz/nellemann/hmci/Insights.java index 46c54e5..258796f 100644 --- a/src/main/java/biz/nellemann/hmci/Insights.java +++ b/src/main/java/biz/nellemann/hmci/Insights.java @@ -17,7 +17,6 @@ package biz.nellemann.hmci; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; @@ -38,11 +37,10 @@ class Insights { Insights(Configuration configuration) { this.configuration = configuration; - try { influxClient = new InfluxClient(configuration.influx); influxClient.login(); - } catch(Exception e) { + } catch (Exception e) { System.exit(1); } diff --git a/src/main/resources/simplelogger.properties b/src/main/resources/simplelogger.properties new file mode 100644 index 0000000..a807e10 --- /dev/null +++ b/src/main/resources/simplelogger.properties @@ -0,0 +1,5 @@ +org.slf4j.simpleLogger.logFile=System.out +org.slf4j.simpleLogger.showDateTime=true +org.slf4j.simpleLogger.showShortLogName=true +org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss.SSS +org.slf4j.simpleLogger.levelInBrackets=true