From 2161cfa6b212d0816d3de2da7a802a0c020e0abb Mon Sep 17 00:00:00 2001 From: Pavel Strobl <116806460+pstrobl96@users.noreply.github.com> Date: Sun, 10 Mar 2024 19:46:19 +0100 Subject: [PATCH] Fixed issues with static checks (#80) --- cmd/main.go | 11 ++++------- prusalink/prometheus.go | 3 --- syslog/collector.go | 1 - syslog/prometheus.go | 1 - 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 14b7926..00df04c 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -16,13 +16,10 @@ import ( ) var ( - configFile = kingpin.Flag("config.file", "Configuration file for prusa_exporter.").Default("./prusa.yml").ExistingFile() - configReload = kingpin.Flag("config.reload", "Interval how often should be config reloaded - 0 for no reload.").Default("300").Int() - metricsPath = kingpin.Flag("exporter.metrics-path", "Path where to expose metrics.").Default("/metrics").String() - exporterMetrics = kingpin.Flag("exporter.metrics", "Decides if expose metrics about exporter itself.").Default("true").Bool() - metricsPort = kingpin.Flag("exporter.metrics-port", "Port where to expose metrics.").Default("10009").Int() - syslogTTL = kingpin.Flag("syslog.ttl", "TTL for syslog metrics in seconds.").Default("60").Int() - prusalinkTimeout = kingpin.Flag("prusalink.timeout", "Timeout for prusalink requests in ms.").Default("1000").Int() + configFile = kingpin.Flag("config.file", "Configuration file for prusa_exporter.").Default("./prusa.yml").ExistingFile() + metricsPath = kingpin.Flag("exporter.metrics-path", "Path where to expose metrics.").Default("/metrics").String() + metricsPort = kingpin.Flag("exporter.metrics-port", "Port where to expose metrics.").Default("10009").Int() + syslogTTL = kingpin.Flag("syslog.ttl", "TTL for syslog metrics in seconds.").Default("60").Int() ) // Run function to start the exporter diff --git a/prusalink/prometheus.go b/prusalink/prometheus.go index 747432b..3e2e1eb 100644 --- a/prusalink/prometheus.go +++ b/prusalink/prometheus.go @@ -11,15 +11,12 @@ import ( // Collector is a struct of all printer metrics type Collector struct { - printerNozzleTemp *prometheus.Desc printerBedTemp *prometheus.Desc printerPrintSpeed *prometheus.Desc - printerNozzleTempTarget *prometheus.Desc printerFiles *prometheus.Desc printerPrintTime *prometheus.Desc printerPrintTimeRemaining *prometheus.Desc printerPrintProgress *prometheus.Desc - printerPrinting *prometheus.Desc printerMaterial *prometheus.Desc printerUp *prometheus.Desc printerNozzleSize *prometheus.Desc diff --git a/syslog/collector.go b/syslog/collector.go index 85a9702..e907063 100644 --- a/syslog/collector.go +++ b/syslog/collector.go @@ -294,7 +294,6 @@ func (collector *Collector) Collect(ch chan<- prometheus.Metric) { log.Error().Msgf("Error parsing value for metric %s: %s", k, err) continue // Skip to next iteration if value parsing fails } - collectorItem = collector.printerCPUUsage ch <- prometheus.MustNewConstMetric(collector.printerCPUUsage, prometheus.GaugeValue, valueParsed/100, getLabels(mac, ip, []string{})...) continue case "loadcell": diff --git a/syslog/prometheus.go b/syslog/prometheus.go index 3836a77..e730fe7 100644 --- a/syslog/prometheus.go +++ b/syslog/prometheus.go @@ -293,7 +293,6 @@ func (collector *Collector) Describe(ch chan<- *prometheus.Desc) { ch <- collector.printerNetworkIn ch <- collector.printerNetworkOut ch <- collector.printerOvercurrent - ch <- collector.printerPrinting ch <- collector.printerPointsDropped ch <- collector.printerPos ch <- collector.printerPowerPanicCount