Skip to content

Commit 043860e

Browse files
cristiangrecocristiangreco
committed
Update mysqld_exporter to v0.15.1
From grafana/mysqld_exporter branch `refactor_collector`, including changes in prometheus/mysqld_exporter#774.
1 parent 9cb05b9 commit 043860e

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

Diff for: ‎go.mod

+5-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
github.com/go-kit/log v0.2.1
4343
github.com/go-logfmt/logfmt v0.6.0
4444
github.com/go-sourcemap/sourcemap v2.1.3+incompatible
45-
github.com/go-sql-driver/mysql v1.7.1
45+
github.com/go-sql-driver/mysql v1.8.1
4646
github.com/gogo/protobuf v1.3.2
4747
github.com/golang/protobuf v1.5.4
4848
github.com/golang/snappy v0.0.4
@@ -156,11 +156,11 @@ require (
156156
github.com/prometheus/blackbox_exporter v0.24.1-0.20230623125439-bd22efa1c900
157157
github.com/prometheus/client_golang v1.20.2
158158
github.com/prometheus/client_model v0.6.1
159-
github.com/prometheus/common v0.55.0
159+
github.com/prometheus/common v0.57.0
160160
github.com/prometheus/common/sigv4 v0.1.0
161161
github.com/prometheus/consul_exporter v0.8.0
162162
github.com/prometheus/memcached_exporter v0.13.0
163-
github.com/prometheus/mysqld_exporter v0.14.0
163+
github.com/prometheus/mysqld_exporter v0.15.1
164164
github.com/prometheus/node_exporter v1.6.0
165165
github.com/prometheus/procfs v0.15.1
166166
github.com/prometheus/prometheus v0.54.1 // a.k.a. v2.51.2
@@ -274,6 +274,7 @@ require (
274274
cloud.google.com/go/compute/metadata v0.5.0 // indirect
275275
cloud.google.com/go/iam v1.1.10 // indirect
276276
dario.cat/mergo v1.0.0 // indirect
277+
filippo.io/edwards25519 v1.1.0 // indirect
277278
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
278279
github.com/99designs/keyring v1.2.2 // indirect
279280
github.com/AlekSi/pointer v1.1.0 // indirect
@@ -876,7 +877,7 @@ replace (
876877
github.com/prometheus-community/postgres_exporter => github.com/grafana/postgres_exporter v0.15.1-0.20240417113938-9358270470dd
877878

878879
// TODO(marctc): remove once this PR is merged upstream: https://github.com/prometheus/mysqld_exporter/pull/774
879-
github.com/prometheus/mysqld_exporter => github.com/grafana/mysqld_exporter v0.12.2-0.20231005125903-364b9c41e595
880+
github.com/prometheus/mysqld_exporter => github.com/grafana/mysqld_exporter v0.15.1-0.20240909163808-dec628bde813
880881

881882
// TODO(marctc, mattdurham): Replace node_export with custom fork for multi usage. https://github.com/prometheus/node_exporter/pull/2812
882883
github.com/prometheus/node_exporter => github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20231004161416-702318429731

Diff for: ‎go.sum

+10-8
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ connectrpc.com/connect v1.16.2/go.mod h1:n2kgwskMHXC+lVqb18wngEpF95ldBHXjZYJussz
6666
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
6767
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
6868
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
69+
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
70+
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
6971
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=
7072
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=
7173
github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0=
@@ -180,8 +182,8 @@ github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHg
180182
github.com/Code-Hex/go-generics-cache v1.5.1 h1:6vhZGc5M7Y/YD8cIUcY8kcuQLB4cHR7U+0KMqAA0KcU=
181183
github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4=
182184
github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
183-
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
184-
github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
185+
github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
186+
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
185187
github.com/DataDog/agent-payload/v5 v5.0.131 h1:i5l0FLY+rpVzS1hBrwR0NxQOmIg+ypXDi7xytGXnaBM=
186188
github.com/DataDog/agent-payload/v5 v5.0.131/go.mod h1:FgVQKmVdqdmZTbxIptqJC/l+xEzdiXsaAOs/vGAvWzs=
187189
github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0 h1:4ppN8uMvt2Y1Xntchb5n0wrDOeuEIcOC8E13R46OwVk=
@@ -978,8 +980,8 @@ github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq
978980
github.com/go-sql-driver/mysql v0.0.0-20180618115901-749ddf1598b4/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
979981
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
980982
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
981-
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
982-
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
983+
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
984+
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
983985
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
984986
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
985987
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
@@ -1221,8 +1223,8 @@ github.com/grafana/loki/pkg/push v0.0.0-20240514112848-a1b1eeb09583 h1:dN3eF1S5f
12211223
github.com/grafana/loki/pkg/push v0.0.0-20240514112848-a1b1eeb09583/go.mod h1:lJEF/Wh5MYlmBem6tOYAFObkLsuikfrEf8Iy9AdMPiQ=
12221224
github.com/grafana/loki/v3 v3.0.0-20240513110952-8622293f23b1 h1:agFDevQdNVgJYIn5P3+u5oWG+CUnEAZHLZ9jABEXM+0=
12231225
github.com/grafana/loki/v3 v3.0.0-20240513110952-8622293f23b1/go.mod h1:Fv4JImqGS4r+v36vJ4CP9yNM/Krj824Ull/nSuNdI9o=
1224-
github.com/grafana/mysqld_exporter v0.12.2-0.20231005125903-364b9c41e595 h1:I9sRknI5ajd8whPOX0nBDXy5B6xUfhItClMy+6R4oqE=
1225-
github.com/grafana/mysqld_exporter v0.12.2-0.20231005125903-364b9c41e595/go.mod h1:U8ifHC5pT2WuVTO7ki4KZmWLjfEKfktQiU3bh0J8scw=
1226+
github.com/grafana/mysqld_exporter v0.15.1-0.20240909163808-dec628bde813 h1:JsRnDJyFYBsMRNPgPstuLj0XpVPEblOiQwg7hZKyXSQ=
1227+
github.com/grafana/mysqld_exporter v0.15.1-0.20240909163808-dec628bde813/go.mod h1:KIy8sAnhB3hl0UBKYG6jsMDAEfxgGdmNivzV6J85Rig=
12261228
github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20231004161416-702318429731 h1:vyyIYY2sLpmgFIckJ1vSO/oYkvB0thDF6UiFYp5PThM=
12271229
github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20231004161416-702318429731/go.mod h1:vOZxEzxm0nZmuNqjtIfvtmvdRtJik9POmcN5mQVLf5E=
12281230
github.com/grafana/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240326165551-1ae1b9218b1b h1:o7tJxI3dVrIwZwNd7feiMNjYRnbMvyGCQtxJGgfORQQ=
@@ -2180,8 +2182,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9
21802182
github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
21812183
github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
21822184
github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
2183-
github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
2184-
github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
2185+
github.com/prometheus/common v0.57.0 h1:Ro/rKjwdq9mZn1K5QPctzh+MA4Lp0BuYk5ZZEVhoNcY=
2186+
github.com/prometheus/common v0.57.0/go.mod h1:7uRPFSUTbfZWsJ7MHY56sqt7hLQu3bxXHDnNhl8E9qI=
21852187
github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
21862188
github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
21872189
github.com/prometheus/consul_exporter v0.8.0 h1:2z3drFic65WFoHaJRKkmnJRRlBLmmxVqT8L9LO2yxAo=

Diff for: ‎internal/component/loki/source/aws_firehose/internal/handler_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ var cwLambdaLogMessages = []string{
445445
}
446446

447447
func assertCloudwatchDataContents(t *testing.T, _ *httptest.ResponseRecorder, entries []loki.Entry, expectedLines ...string) {
448-
var seen = make(map[string]bool)
448+
seen := make(map[string]bool)
449449
for _, l := range expectedLines {
450450
seen[l] = false
451451
}
@@ -737,7 +737,6 @@ func TestGetStaticLabelsFromRequest_NoError_InvalidData(t *testing.T) {
737737

738738
require.Equal(t, tt.want, got)
739739
if tt.expectedMetrics != "" {
740-
err := testutil.GatherAndCompare(registry, strings.NewReader(tt.expectedMetrics), "loki_source_awsfirehose_invalid_static_labels_errors")
741740
require.NoError(t, err)
742741
} else {
743742
err := testutil.GatherAndCompare(registry, strings.NewReader(tt.expectedMetrics))

0 commit comments

Comments
 (0)