Skip to content

Commit 7aa457c

Browse files
authored
Merge pull request #2 from civitatis/DEVOPS-2320
Devops 2320
2 parents 907ce91 + e0cf50d commit 7aa457c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+540
-461
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88

9-
- name: Set up Go 1.20
9+
- name: Set up Go 1.24
1010
uses: actions/setup-go@v3
1111
with:
12-
go-version: "1.20"
12+
go-version: "1.24"
1313
id: go
1414

1515
- name: Check out code into the Go module directory

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM golang:1.20 AS builder
1+
FROM golang:1.24 AS builder
22

33
ARG VERSION
4-
ENV PKG github.com/resmoio/kubernetes-event-exporter/pkg
4+
ENV PKG github.com/civitatis/kubernetes-event-exporter/pkg
55

66
ADD . /app
77
WORKDIR /app

README.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
# kubernetes-event-exporter
22

3-
> **Note**: This is an active fork of [Opsgenie Kubernetes Event Exporter](https://github.com/opsgenie/kubernetes-event-exporter)
4-
since that is not maintained since November 2021. Development is sponsored by [Resmo](https://www.resmo.com).
3+
## Important Notice
4+
5+
This repository is a fork from [Kubernetes Event Exporter by Resmoio](https://github.com/resmoio/kubernetes-event-exporter) and is not actively maintained. However, it includes significant improvements over the original that users may find beneficial:
6+
7+
* **Enhanced timestamp handling**: Fixes unnecessary "max Event age seconds" errors.
8+
* **Upgraded Go version**: Updated from Go 1.20 to Go 1.24, incorporating various built-in enhancements.
9+
* **Updated dependencies (June 2025)**: Resolves critical vulnerabilities, including:
10+
11+
* CVE-2024-6104 in `github.com/hashicorp/go-retryablehttp`
12+
* CVE-2024-45337, CVE-2025-22869 in `golang.org/x/crypto`
13+
* CVE-2023-45288, CVE-2025-22870, CVE-2025-22872 in `golang.org/x/net`
14+
* CVE-2023-44487 in `google.golang.org/grpc`
15+
* CVE-2024-24786 in `google.golang.org/protobuf`
16+
17+
Users are encouraged to leverage these updates for a more secure and reliable experience.
518

619
> This tool is presented at [KubeCon 2019 San Diego](https://kccncna19.sched.com/event/6aa61eca397e4ff2bdbb2845e5aebb81).
720
@@ -27,7 +40,7 @@ kubectl create namespace monitoring
2740
apiVersion: kustomize.config.k8s.io/v1beta1
2841
kind: Kustomization
2942
resources:
30-
- https://github.com/resmoio/kubernetes-event-exporter?ref=master
43+
- https://github.com/civitatis/kubernetes-event-exporter?ref=master
3144
```
3245
3346
### Helm

deploy/02-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
- name: event-exporter
2525
# The good practice would be to pin the version. This is just a reference so that we don't
2626
# have to update this file in each release.
27-
image: ghcr.io/resmoio/kubernetes-event-exporter:latest
27+
image: ghcr.io/civitatis/kubernetes-event-exporter:latest
2828
imagePullPolicy: IfNotPresent
2929
args:
3030
- -conf=/data/config.yaml

go.mod

Lines changed: 108 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,152 @@
1-
module github.com/resmoio/kubernetes-event-exporter
1+
module github.com/civitatis/kubernetes-event-exporter
22

3-
go 1.20
3+
go 1.24.0
4+
5+
toolchain go1.24.3
46

57
require (
6-
cloud.google.com/go/bigquery v1.44.0
7-
cloud.google.com/go/pubsub v1.28.0
8-
github.com/Masterminds/sprig/v3 v3.2.3
9-
github.com/Shopify/sarama v1.37.2
10-
github.com/aws/aws-sdk-go v1.44.162
11-
github.com/elastic/go-elasticsearch/v7 v7.17.7
12-
github.com/goccy/go-yaml v1.11.0
13-
github.com/hashicorp/golang-lru v0.5.3
14-
github.com/linkedin/goavro/v2 v2.12.0
8+
cloud.google.com/go/bigquery v1.69.0
9+
cloud.google.com/go/pubsub v1.49.0
10+
github.com/Masterminds/sprig/v3 v3.3.0
11+
github.com/Shopify/sarama v1.38.1
12+
github.com/aws/aws-sdk-go v1.55.7
13+
github.com/elastic/go-elasticsearch/v7 v7.17.10
14+
github.com/goccy/go-yaml v1.18.0
15+
github.com/hashicorp/golang-lru v1.0.2
16+
github.com/linkedin/goavro/v2 v2.13.1
1517
github.com/opensearch-project/opensearch-go v1.1.0
16-
github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.14
17-
github.com/prometheus/client_golang v1.16.0
18-
github.com/prometheus/exporter-toolkit v0.10.0
19-
github.com/rs/zerolog v1.28.0
20-
github.com/slack-go/slack v0.12.0
21-
github.com/stretchr/testify v1.8.1
22-
google.golang.org/api v0.107.0
23-
gopkg.in/natefinch/lumberjack.v2 v2.0.0
24-
k8s.io/api v0.26.7
25-
k8s.io/apimachinery v0.26.7
26-
k8s.io/client-go v0.26.7
18+
github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.23
19+
github.com/prometheus/client_golang v1.22.0
20+
github.com/prometheus/exporter-toolkit v0.14.0
21+
github.com/rs/zerolog v1.34.0
22+
github.com/slack-go/slack v0.17.0
23+
github.com/stretchr/testify v1.10.0
24+
google.golang.org/api v0.236.0
25+
gopkg.in/natefinch/lumberjack.v2 v2.2.1
26+
k8s.io/api v0.33.1
27+
k8s.io/apimachinery v0.33.1
28+
k8s.io/client-go v0.33.1
2729
)
2830

2931
require (
32+
cloud.google.com/go/auth v0.16.1 // indirect
33+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
34+
dario.cat/mergo v1.0.2 // indirect
35+
github.com/apache/arrow/go/v15 v15.0.2 // indirect
36+
github.com/felixge/httpsnoop v1.0.4 // indirect
37+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
38+
github.com/go-logr/stdr v1.2.2 // indirect
39+
github.com/goccy/go-json v0.10.5 // indirect
40+
github.com/google/flatbuffers v25.2.10+incompatible // indirect
41+
github.com/google/gnostic-models v0.6.9 // indirect
42+
github.com/google/s2a-go v0.1.9 // indirect
43+
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
44+
github.com/kylelemons/godebug v1.1.0 // indirect
45+
github.com/mdlayher/socket v0.5.1 // indirect
46+
github.com/mdlayher/vsock v1.2.1 // indirect
47+
github.com/x448/float16 v0.8.4 // indirect
3048
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
3149
github.com/xdg-go/stringprep v1.0.4 // indirect
50+
github.com/zeebo/xxh3 v1.0.2 // indirect
51+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
52+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
53+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
54+
go.opentelemetry.io/otel v1.36.0 // indirect
55+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
56+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
57+
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b // indirect
58+
golang.org/x/mod v0.24.0 // indirect
59+
golang.org/x/tools v0.33.0 // indirect
60+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
61+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
62+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
63+
sigs.k8s.io/randfill v1.0.0 // indirect
3264
)
3365

3466
require (
35-
cloud.google.com/go v0.107.0 // indirect
36-
cloud.google.com/go/compute v1.15.1 // indirect
37-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
38-
cloud.google.com/go/iam v0.9.0 // indirect
67+
cloud.google.com/go v0.121.2 // indirect
68+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
69+
cloud.google.com/go/iam v1.5.2 // indirect
3970
github.com/Masterminds/goutils v1.1.1 // indirect
40-
github.com/Masterminds/semver/v3 v3.2.0 // indirect
71+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4172
github.com/beorn7/perks v1.0.1 // indirect
42-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
73+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4374
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4475
github.com/davecgh/go-spew v1.1.1 // indirect
45-
github.com/eapache/go-resiliency v1.3.0 // indirect
46-
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
76+
github.com/eapache/go-resiliency v1.7.0 // indirect
77+
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
4778
github.com/eapache/queue v1.1.0 // indirect
48-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
49-
github.com/fatih/color v1.15.0 // indirect
50-
github.com/go-kit/log v0.2.1 // indirect
51-
github.com/go-logfmt/logfmt v0.5.1 // indirect
52-
github.com/go-logr/logr v1.2.3 // indirect
53-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
54-
github.com/go-openapi/jsonreference v0.20.0 // indirect
55-
github.com/go-openapi/swag v0.22.3 // indirect
79+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
80+
github.com/fatih/color v1.18.0 // indirect
81+
github.com/go-logr/logr v1.4.3 // indirect
82+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
83+
github.com/go-openapi/jsonreference v0.21.0 // indirect
84+
github.com/go-openapi/swag v0.23.1 // indirect
5685
github.com/gogo/protobuf v1.3.2 // indirect
57-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
58-
github.com/golang/protobuf v1.5.3 // indirect
59-
github.com/golang/snappy v0.0.4 // indirect
60-
github.com/google/gnostic v0.6.9 // indirect
61-
github.com/google/go-cmp v0.5.9 // indirect
62-
github.com/google/gofuzz v1.2.0 // indirect
63-
github.com/google/uuid v1.3.0 // indirect
64-
github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
65-
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
66-
github.com/gorilla/websocket v1.5.0 // indirect
86+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
87+
github.com/golang/snappy v1.0.0 // indirect
88+
github.com/google/go-cmp v0.7.0 // indirect
89+
github.com/google/uuid v1.6.0 // indirect
90+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
91+
github.com/googleapis/gax-go/v2 v2.14.2 // indirect
92+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
6793
github.com/hashicorp/errwrap v1.1.0 // indirect
6894
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
6995
github.com/hashicorp/go-multierror v1.1.1 // indirect
70-
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
96+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
7197
github.com/hashicorp/go-uuid v1.0.3 // indirect
72-
github.com/huandu/xstrings v1.4.0 // indirect
73-
github.com/imdario/mergo v0.3.13 // indirect
98+
github.com/huandu/xstrings v1.5.0 // indirect
7499
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
75100
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
76101
github.com/jcmturner/gofork v1.7.6 // indirect
77-
github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
102+
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
78103
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
79104
github.com/jmespath/go-jmespath v0.4.0 // indirect
80105
github.com/josharian/intern v1.0.0 // indirect
81106
github.com/jpillora/backoff v1.0.0 // indirect
82107
github.com/json-iterator/go v1.1.12 // indirect
83-
github.com/klauspost/compress v1.15.13 // indirect
84-
github.com/mailru/easyjson v0.7.7 // indirect
85-
github.com/mattn/go-colorable v0.1.13 // indirect
86-
github.com/mattn/go-isatty v0.0.17 // indirect
87-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
108+
github.com/klauspost/compress v1.18.0 // indirect
109+
github.com/mailru/easyjson v0.9.0 // indirect
110+
github.com/mattn/go-colorable v0.1.14 // indirect
111+
github.com/mattn/go-isatty v0.0.20 // indirect
88112
github.com/mitchellh/copystructure v1.2.0 // indirect
89113
github.com/mitchellh/reflectwalk v1.0.2 // indirect
90114
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
91115
github.com/modern-go/reflect2 v1.0.2 // indirect
92116
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
93117
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
94-
github.com/pierrec/lz4/v4 v4.1.17 // indirect
118+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
95119
github.com/pkg/errors v0.9.1 // indirect
96120
github.com/pmezard/go-difflib v1.0.0 // indirect
97-
github.com/prometheus/client_model v0.4.0 // indirect
98-
github.com/prometheus/common v0.44.0 // indirect
99-
github.com/prometheus/procfs v0.10.1 // indirect
100-
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
101-
github.com/shopspring/decimal v1.2.0 // indirect
102-
github.com/sirupsen/logrus v1.9.0 // indirect
103-
github.com/spf13/cast v1.3.1 // indirect
104-
github.com/spf13/pflag v1.0.5 // indirect
121+
github.com/prometheus/client_model v0.6.2 // indirect
122+
github.com/prometheus/common v0.64.0 // indirect
123+
github.com/prometheus/procfs v0.16.1 // indirect
124+
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
125+
github.com/shopspring/decimal v1.4.0 // indirect
126+
github.com/sirupsen/logrus v1.9.3 // indirect
127+
github.com/spf13/cast v1.9.2 // indirect
128+
github.com/spf13/pflag v1.0.6 // indirect
105129
github.com/xdg-go/scram v1.1.2
106130
go.opencensus.io v0.24.0 // indirect
107-
golang.org/x/crypto v0.17.0 // indirect
108-
golang.org/x/net v0.17.0 // indirect
109-
golang.org/x/oauth2 v0.8.0 // indirect
110-
golang.org/x/sync v0.2.0 // indirect
111-
golang.org/x/sys v0.15.0 // indirect
112-
golang.org/x/term v0.15.0 // indirect
113-
golang.org/x/text v0.14.0 // indirect
114-
golang.org/x/time v0.3.0 // indirect
115-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
116-
google.golang.org/appengine v1.6.7 // indirect
117-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
118-
google.golang.org/grpc v1.53.0 // indirect
119-
google.golang.org/protobuf v1.30.0 // indirect
131+
golang.org/x/crypto v0.38.0 // indirect
132+
golang.org/x/net v0.40.0 // indirect
133+
golang.org/x/oauth2 v0.30.0 // indirect
134+
golang.org/x/sync v0.14.0 // indirect
135+
golang.org/x/sys v0.33.0 // indirect
136+
golang.org/x/term v0.32.0 // indirect
137+
golang.org/x/text v0.25.0 // indirect
138+
golang.org/x/time v0.11.0 // indirect
139+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
140+
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
141+
google.golang.org/grpc v1.72.2 // indirect
142+
google.golang.org/protobuf v1.36.6 // indirect
120143
gopkg.in/inf.v0 v0.9.1 // indirect
121144
gopkg.in/yaml.v2 v2.4.0 // indirect
122145
gopkg.in/yaml.v3 v3.0.1 // indirect
123-
k8s.io/klog/v2 v2.80.1 // indirect
124-
k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715 // indirect
125-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
126-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
127-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
128-
sigs.k8s.io/yaml v1.3.0 // indirect
146+
k8s.io/klog/v2 v2.130.1 // indirect
147+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
148+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
149+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
150+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
151+
sigs.k8s.io/yaml v1.4.0 // indirect
129152
)

0 commit comments

Comments
 (0)