Skip to content

Commit

Permalink
Update multiple dependencies (#339)
Browse files Browse the repository at this point in the history
Update docker, helm and go dependencies
  • Loading branch information
kuskoman authored Jul 17, 2024
1 parent 048b78b commit db696db
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 30 deletions.
10 changes: 5 additions & 5 deletions .helm/logstash-integration-test-chart/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ dependencies:
version: 8.5.1
- name: apache
repository: https://charts.bitnami.com/bitnami
version: 9.2.23
version: 11.2.8
- name: prometheus
repository: https://prometheus-community.github.io/helm-charts
version: 20.2.0
version: 25.24.0
- name: logstash-exporter
repository: file://../../chart/
version: v1.0.2
digest: sha256:1733217c222c212aac4b58826c147d7acb2f61fe01ce6985b139050803915d92
generated: "2023-04-12T10:38:00.905306965+02:00"
version: 1.6.1
digest: sha256:f42ffd0c05263f4950c9c62aea6ec9d582a68544baab4f2c454df18d17f9d150
generated: "2024-07-17T09:59:13.512725+02:00"
6 changes: 3 additions & 3 deletions .helm/logstash-integration-test-chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ type: application
version: 0.1.0
dependencies:
- name: logstash
version: "8.5.1"
version: "^8.5.1"
repository: https://helm.elastic.co
condition: logstash.enabled
# we are replacing elasticsearch with apache for testing purposes
- name: apache
version: "^9.2.23"
version: "^11.2.8"
repository: https://charts.bitnami.com/bitnami
condition: apache.enabled
- name: prometheus
version: "^20.2.0"
version: "^25.24.0"
repository: https://prometheus-community.github.io/helm-charts
condition: prometheus.enabled
- name: logstash-exporter
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.0-alpine3.19 as build
FROM golang:1.22.5-alpine3.20 as build

ARG VERSION \
GIT_COMMIT \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM cosmtrek/air:v1.49.0 as air
FROM cosmtrek/air:v1.52.3 as air

FROM golang:1.22.0-alpine3.19
FROM golang:1.22.5-alpine3.20

WORKDIR /app

Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.8"
services:
logstash:
image: docker.elastic.co/logstash/logstash:8.9.0
image: docker.elastic.co/logstash/logstash:8.14.3
restart: unless-stopped
volumes:
- logstash-data:/usr/share/logstash/data
Expand All @@ -23,7 +23,7 @@ services:
- ${LOGSTASH_PORT:-5044}:5044
- ${LOGSTASH_STATS_PORT:-9600}:9600
prometheus:
image: prom/prometheus:v2.46.0
image: prom/prometheus:v2.53.1
restart: unless-stopped
volumes:
- prometheus-data:/prometheus
Expand All @@ -42,7 +42,7 @@ services:
timeout: 10s
retries: 8
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.9.0
image: docker.elastic.co/elasticsearch/elasticsearch:8.14.3
restart: unless-stopped
volumes:
- elasticsearch-data:/usr/share/elasticsearch/data
Expand All @@ -65,7 +65,7 @@ services:
ports:
- ${ELASTICSEARCH_PORT:-9200}:9200
grafana:
image: grafana/grafana:10.0.3
image: grafana/grafana:10.2.8
restart: unless-stopped
ports:
- ${GRAFANA_PORT:-3000}:3000
Expand Down
11 changes: 6 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22

require (
github.com/joho/godotenv v1.5.1
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/client_golang v1.19.1
)

require (
Expand All @@ -13,6 +13,7 @@ require (
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/maruel/natural v1.1.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/tidwall/gjson v1.17.1 // indirect
github.com/tidwall/match v1.1.1 // indirect
Expand All @@ -25,8 +26,8 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/gkampitakis/go-snaps v0.5.3
github.com/prometheus/client_model v0.6.1
github.com/prometheus/common v0.52.3 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
golang.org/x/sys v0.19.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
golang.org/x/sys v0.22.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
)
22 changes: 12 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,17 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo=
github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
github.com/prometheus/common v0.52.3 h1:5f8uj6ZwHSscOGNdIQg6OiZv/ybiK2CO2q2drVZAQSA=
github.com/prometheus/common v0.52.3/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U=
github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o=
github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g=
github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
Expand All @@ -43,7 +45,7 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=

0 comments on commit db696db

Please sign in to comment.