Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/github.com/elastic/apm…
Browse files Browse the repository at this point in the history
…-data-1.13.1
  • Loading branch information
kruskall authored Sep 9, 2024
2 parents dd92cfd + f4dcc31 commit 6d9aa17
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 12 deletions.
6 changes: 1 addition & 5 deletions .ci/updatecli/values.d/scm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@ scm:
owner: elastic
repository: apm-server
branch: main
commitusingapi: true
# begin updatecli-compose policy values
user: obltmachine
email: [email protected]
commitusingapi: true
# end updatecli-compose policy values

# This will be moved to the scm section in the future and use
# commitusingapi instead.
signedcommit: true
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
- uses: actions/checkout@v4
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@40853de9f8ce2d6cfdc73c1b96f14e22ba44aec4 # v45.0.0
uses: tj-actions/changed-files@e9772d140489982e0e3704fea5ee93d536f1e275 # v45.0.1
with:
files: .go-version

Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.23.0
1.23.1
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ x-logging: &default-logging
max-size: "1g"
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.16.0-a3caaa65-SNAPSHOT
image: docker.elastic.co/elasticsearch/elasticsearch:8.16.0-4dd6a303-SNAPSHOT
ports:
- 9200:9200
healthcheck:
Expand Down Expand Up @@ -41,7 +41,7 @@ services:
logging: *default-logging

kibana:
image: docker.elastic.co/kibana/kibana:8.16.0-a3caaa65-SNAPSHOT
image: docker.elastic.co/kibana/kibana:8.16.0-4dd6a303-SNAPSHOT
ports:
- 5601:5601
healthcheck:
Expand All @@ -60,7 +60,7 @@ services:
logging: *default-logging

metricbeat:
image: docker.elastic.co/beats/metricbeat:8.16.0-a3caaa65-SNAPSHOT
image: docker.elastic.co/beats/metricbeat:8.16.0-4dd6a303-SNAPSHOT
environment:
ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"
Expand Down
4 changes: 2 additions & 2 deletions updatecli-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# https://www.updatecli.io/docs/core/compose/
policies:
- name: Handle ironbank bumps
policy: ghcr.io/elastic/oblt-updatecli-policies/ironbank/templates:0.1.0@sha256:00483be31c74d3f95ea37d1ca7aeee98131ab2c5c1f901a043e9afb122a445b0
policy: ghcr.io/elastic/oblt-updatecli-policies/ironbank/templates:0.3.0@sha256:b0c841d8fb294e6b58359462afbc83070dca375ac5dd0c5216c8926872a98bb1
values:
- .ci/updatecli/values.d/scm.yml
- .ci/updatecli/values.d/ironbank.yml
- name: Update Updatecli policies
policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.4.0@sha256:254367f5b1454fd6032b88b314450cd3b6d5e8d5b6c953eb242a6464105eb869
policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.5.0@sha256:df7fb3a9e3348a9749527edf867be1090f452f9ee0c2116aab6de39729850d53
values:
- .ci/updatecli/values.d/scm.yml
- .ci/updatecli/values.d/updatecli-compose.yml

0 comments on commit 6d9aa17

Please sign in to comment.