From c6d3945ae773e7d563a338042b4dffbff0b76c66 Mon Sep 17 00:00:00 2001 From: Jeremy Edwards <1312331+jeremyje@users.noreply.github.com> Date: Tue, 25 Oct 2022 00:41:08 -0700 Subject: [PATCH] Fix CPU count and some details --- go.mod | 4 +--- go.sum | 9 ++------- install/compose/docker-compose.yaml | 12 ------------ install/compose/grafana/dashboards/cpu.json | 14 +++++++++----- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index 529cc24..abd6f05 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,8 @@ module github.com/jeremyje/coretemp-exporter go 1.18 require ( - github.com/jeremyje/coretempsdk-go v0.4.0 + github.com/jeremyje/coretempsdk-go v0.5.0 github.com/prometheus/client_golang v1.13.0 - github.com/yusufpapurcu/wmi v1.2.2 go.opentelemetry.io/otel v1.11.0 go.opentelemetry.io/otel/exporters/prometheus v0.32.3 go.opentelemetry.io/otel/metric v0.32.3 @@ -17,7 +16,6 @@ require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect github.com/prometheus/client_model v0.2.0 // indirect diff --git a/go.sum b/go.sum index 87484b9..8608354 100644 --- a/go.sum +++ b/go.sum @@ -74,8 +74,6 @@ github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= -github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -134,8 +132,8 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/jeremyje/coretempsdk-go v0.4.0 h1:BEXlqYhWlA9hNQIVPwyebVbA3BHrzukix270NwrXFb8= -github.com/jeremyje/coretempsdk-go v0.4.0/go.mod h1:VwgOwXdg3aFQB6ml0+fJ04LRaCD8SgmTC20TDVfKl9s= +github.com/jeremyje/coretempsdk-go v0.5.0 h1:BCpO0aFwQ/tvlhscusLAt5RJ6H9NHwXMxoYFrn3mNIs= +github.com/jeremyje/coretempsdk-go v0.5.0/go.mod h1:VwgOwXdg3aFQB6ml0+fJ04LRaCD8SgmTC20TDVfKl9s= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -205,8 +203,6 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= -github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -319,7 +315,6 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/install/compose/docker-compose.yaml b/install/compose/docker-compose.yaml index 485e8ac..fedb7c8 100644 --- a/install/compose/docker-compose.yaml +++ b/install/compose/docker-compose.yaml @@ -61,18 +61,6 @@ services: environment: - METRICS_STORAGE_TYPE=prometheus - PROMETHEUS_SERVER_URL=http://prometheus:9090 - jaeger-query: - image: jaegertracing/jaeger-query:latest - hostname: jaeger-query - restart: always - networks: - - coretemp-net - ports: - - 16685:16685 - - 16687:16687 - environment: - - METRICS_STORAGE_TYPE=prometheus - - PROMETHEUS_SERVER_URL=http://prometheus:9090 volumes: prom_data: networks: diff --git a/install/compose/grafana/dashboards/cpu.json b/install/compose/grafana/dashboards/cpu.json index be7b930..fb1c4f9 100644 --- a/install/compose/grafana/dashboards/cpu.json +++ b/install/compose/grafana/dashboards/cpu.json @@ -24,7 +24,6 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 5, "links": [], "liveNow": false, "panels": [ @@ -253,9 +252,13 @@ "color": "green", "value": null }, + { + "color": "#EAB839", + "value": 3000000000 + }, { "color": "red", - "value": 80 + "value": 5000000000 } ] }, @@ -290,7 +293,7 @@ "uid": "PBFA97CFB590B2093" }, "editorMode": "builder", - "expr": "cpu_detail", + "expr": "cpu_speed", "legendFormat": "{{model}}", "range": true, "refId": "A" @@ -300,6 +303,7 @@ "type": "gauge" } ], + "refresh": "5s", "schemaVersion": 37, "style": "dark", "tags": [], @@ -307,13 +311,13 @@ "list": [] }, "time": { - "from": "now-5m", + "from": "now-15m", "to": "now" }, "timepicker": {}, "timezone": "", "title": "CPU", "uid": "RwtPEDHVz", - "version": 1, + "version": 2, "weekStart": "" } \ No newline at end of file