Skip to content

Commit 4ef8c26

Browse files
niemyjskiniemyjski
committed
Merge remote-tracking branch 'origin/main' into feature/next-project-management
2 parents a747efc + 1dd68e5 commit 4ef8c26

15 files changed

+87
-81
lines changed

‎.devcontainer/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
# (Adding the "ports" property to this file will not forward from a Codespace.)
2323

2424
elasticsearch:
25-
image: exceptionless/elasticsearch:8.17.3
25+
image: exceptionless/elasticsearch:8.17.4
2626
environment:
2727
node.name: elasticsearch
2828
cluster.name: exceptionless
@@ -38,7 +38,7 @@ services:
3838
kibana:
3939
depends_on:
4040
- elasticsearch
41-
image: docker.elastic.co/kibana/kibana:8.17.3
41+
image: docker.elastic.co/kibana/kibana:8.17.4
4242
environment:
4343
xpack.security.enabled: "false"
4444
ports:

‎Dockerfile

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"]
9898

9999
# completely self-contained
100100

101-
FROM exceptionless/elasticsearch:8.17.3 AS exceptionless
101+
FROM exceptionless/elasticsearch:8.17.4 AS exceptionless
102102

103103
WORKDIR /app
104104
COPY --from=job-publish /app/src/Exceptionless.Job/out ./
@@ -113,17 +113,17 @@ USER root
113113
# install dotnet and supervisor
114114
RUN apt-get update -y && \
115115
apt-get install -y --no-install-recommends \
116-
wget \
117-
apt-transport-https \
118-
supervisor \
119-
dos2unix \
120-
libc6 \
121-
libgcc1 \
122-
libgssapi-krb5-2 \
123-
libicu66 \
124-
libssl1.1 \
125-
libstdc++6 \
126-
zlib1g && \
116+
wget \
117+
apt-transport-https \
118+
supervisor \
119+
dos2unix \
120+
libc6 \
121+
libgcc1 \
122+
libgssapi-krb5-2 \
123+
libicu66 \
124+
libssl1.1 \
125+
libstdc++6 \
126+
zlib1g && \
127127
dos2unix /app/docker-entrypoint.sh
128128

129129
ENV discovery.type=single-node \
@@ -171,17 +171,17 @@ USER root
171171
# install dotnet and supervisor
172172
RUN apt-get update -y && \
173173
apt-get install -y --no-install-recommends \
174-
wget \
175-
apt-transport-https \
176-
supervisor \
177-
dos2unix \
178-
libc6 \
179-
libgcc1 \
180-
libgssapi-krb5-2 \
181-
libicu66 \
182-
libssl1.1 \
183-
libstdc++6 \
184-
zlib1g && \
174+
wget \
175+
apt-transport-https \
176+
supervisor \
177+
dos2unix \
178+
libc6 \
179+
libgcc1 \
180+
libgssapi-krb5-2 \
181+
libicu66 \
182+
libssl1.1 \
183+
libstdc++6 \
184+
zlib1g && \
185185
dos2unix /app/docker-entrypoint.sh
186186

187187
ENV discovery.type=single-node \

‎build/docker/elasticsearch/8.x/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# https://www.docker.elastic.co/
2-
FROM docker.elastic.co/elasticsearch/elasticsearch:8.17.3
2+
FROM docker.elastic.co/elasticsearch/elasticsearch:8.17.4
33

44
RUN elasticsearch-plugin install -b mapper-size
55

‎docker/docker-compose.apm.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2.2"
22

33
services:
44
setup:
5-
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.3
5+
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.4
66
volumes:
77
- certs:/usr/share/elasticsearch/config/certs
88
user: "0"
@@ -53,7 +53,7 @@ services:
5353
depends_on:
5454
setup:
5555
condition: service_healthy
56-
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.3
56+
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.4
5757
volumes:
5858
- certs:/usr/share/elasticsearch/config/certs
5959
- esdata:/usr/share/elasticsearch/data
@@ -98,7 +98,7 @@ services:
9898
depends_on:
9999
elasticsearch:
100100
condition: service_healthy
101-
image: docker.elastic.co/kibana/kibana:8.17.3
101+
image: docker.elastic.co/kibana/kibana:8.17.4
102102
volumes:
103103
- certs:/usr/share/kibana/config/certs
104104
ports:
@@ -124,7 +124,7 @@ services:
124124
depends_on:
125125
elasticsearch:
126126
condition: service_healthy
127-
image: docker.elastic.co/apm/apm-server:8.17.3
127+
image: docker.elastic.co/apm/apm-server:8.17.4
128128
volumes:
129129
- certs:/usr/share/apm-server/certs
130130
ports:

‎docker/docker-compose.dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ services:
5050
- appdata:/app/storage
5151

5252
elasticsearch:
53-
image: exceptionless/elasticsearch:8.17.3
53+
image: exceptionless/elasticsearch:8.17.4
5454
environment:
5555
discovery.type: single-node
5656
xpack.security.enabled: "false"
@@ -64,7 +64,7 @@ services:
6464
kibana:
6565
depends_on:
6666
- elasticsearch
67-
image: docker.elastic.co/kibana/kibana:8.17.3
67+
image: docker.elastic.co/kibana/kibana:8.17.4
6868
ports:
6969
- 5601:5601
7070

‎docker/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
elasticsearch:
3-
image: exceptionless/elasticsearch:8.17.3
3+
image: exceptionless/elasticsearch:8.17.4
44
environment:
55
node.name: elasticsearch
66
cluster.name: exceptionless
@@ -16,7 +16,7 @@ services:
1616
kibana:
1717
depends_on:
1818
- elasticsearch
19-
image: docker.elastic.co/kibana/kibana:8.17.3
19+
image: docker.elastic.co/kibana/kibana:8.17.4
2020
environment:
2121
xpack.security.enabled: "false"
2222
ports:

‎k8s/elastic-monitor.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: elastic-monitor
55
namespace: elastic-system
66
spec:
7-
version: 8.17.3
7+
version: 8.17.4
88
podDisruptionBudget: {}
99
nodeSets:
1010
- name: main
@@ -51,7 +51,7 @@ metadata:
5151
name: kibana-monitor
5252
namespace: elastic-system
5353
spec:
54-
version: 8.17.3
54+
version: 8.17.4
5555
count: 1
5656
elasticsearchRef:
5757
name: elastic-monitor
@@ -145,7 +145,7 @@ metadata:
145145
name: fleet-server
146146
namespace: elastic-system
147147
spec:
148-
version: 8.17.3
148+
version: 8.17.4
149149
kibanaRef:
150150
name: kibana-monitor
151151
elasticsearchRefs:
@@ -169,7 +169,7 @@ metadata:
169169
name: elastic-agent
170170
namespace: elastic-system
171171
spec:
172-
version: 8.17.3
172+
version: 8.17.4
173173
kibanaRef:
174174
name: kibana-monitor
175175
fleetServerRef:

‎k8s/ex-dev-elasticsearch.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ metadata:
44
name: ex-dev
55
namespace: ex-dev
66
spec:
7-
version: 8.17.3
8-
image: exceptionless/elasticsearch:8.17.3 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
7+
version: 8.17.4
8+
image: exceptionless/elasticsearch:8.17.4 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
99
secureSettings:
1010
- secretName: ex-dev-snapshots
1111
http:
@@ -57,7 +57,7 @@ metadata:
5757
name: ex-dev
5858
namespace: ex-dev
5959
spec:
60-
version: 8.17.3
60+
version: 8.17.4
6161
count: 1
6262
elasticsearchRef:
6363
name: ex-dev

‎k8s/ex-prod-elasticsearch.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ metadata:
44
name: ex-prod
55
namespace: ex-prod
66
spec:
7-
version: 8.17.3
8-
image: exceptionless/elasticsearch:8.17.3 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
7+
version: 8.17.4
8+
image: exceptionless/elasticsearch:8.17.4 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
99
monitoring:
1010
metrics:
1111
elasticsearchRefs:
@@ -68,7 +68,7 @@ metadata:
6868
name: ex-prod
6969
namespace: ex-prod
7070
spec:
71-
version: 8.17.3
71+
version: 8.17.4
7272
count: 1
7373
elasticsearchRef:
7474
name: ex-prod

‎k8s/ex-prod-tasks.ps1

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# get elasticsearch password
2-
$ELASTIC_PASSWORD=$(kubectl get secret --namespace ex-prod "ex-prod-es-elastic-user" -o go-template='{{.data.elastic | base64decode }}')
2+
$ELASTIC_PASSWORD = $(kubectl get secret --namespace ex-prod "ex-prod-es-elastic-user" -o go-template='{{.data.elastic | base64decode }}')
33

44
# connect to kibana
55
$ELASTIC_JOB = kubectl port-forward --namespace ex-prod service/ex-prod-kb-http 5660:5601 &
@@ -12,7 +12,7 @@ Remove-Job $ELASTIC_JOB
1212
curl -k https://elastic:$ELASTIC_PASSWORD@localhost:9260/_cluster/health?pretty
1313

1414
# port forward monitoring elasticsearch
15-
$ELASTIC_MONITOR_PASSWORD=$(kubectl get secret --namespace elastic-system "elastic-monitor-es-elastic-user" -o go-template='{{.data.elastic | base64decode }}')
15+
$ELASTIC_MONITOR_PASSWORD = $(kubectl get secret --namespace elastic-system "elastic-monitor-es-elastic-user" -o go-template='{{.data.elastic | base64decode }}')
1616
$ELASTIC_JOB = kubectl port-forward --namespace elastic-system service/elastic-monitor-es-http 9280:9200 &
1717
Remove-Job $ELASTIC_JOB
1818

@@ -26,11 +26,11 @@ curl -X PUT -H "Content-Type: application/json" -g -k -d '{ "transient": { "acti
2626
curl -k -X DELETE "https://elastic:$ELASTIC_MONITOR_PASSWORD@localhost:9280/.ds-traces-apm-default-2022.09.01-000108"
2727

2828
# connect to redis OR use k9s to shell into a redis pod
29-
$REDIS_PASSWORD=$(kubectl get secret --namespace ex-prod ex-prod-redis -o go-template='{{index .data "redis-password" | base64decode }}')
29+
$REDIS_PASSWORD = $(kubectl get secret --namespace ex-prod ex-prod-redis -o go-template='{{index .data "redis-password" | base64decode }}')
3030
kubectl exec --stdin --tty ex-prod-redis-node-0 -- /bin/bash -c "redis-cli -a $REDIS_PASSWORD"
3131

3232
# open kubernetes dashboard
33-
$DASHBOARD_PASSWORD=$(kubectl get secret --namespace kubernetes-dashboard admin-user-token-w8jg7 -o go-template='{{.data.token | base64decode }}')
33+
$DASHBOARD_PASSWORD = $(kubectl get secret --namespace kubernetes-dashboard admin-user-token-w8jg7 -o go-template='{{.data.token | base64decode }}')
3434
kubectl proxy
3535
Start-Process "http://localhost:8001/api/v1/namespaces/kubernetes-dashboard/services/https:kubernetes-dashboard:/proxy/"
3636

@@ -81,12 +81,16 @@ helm repo update
8181
helm upgrade goldilocks fairwinds-stable/goldilocks --namespace goldilocks --reset-values --dry-run
8282
helm upgrade vpa fairwinds-stable/vpa --namespace vpa -f vpa-values.yaml --reset-values --dry-run
8383

84+
# upgrade signoz
85+
helm repo update
86+
helm upgrade --reset-values signoz-collector signoz/k8s-infra -f signoz.yaml --set "signozApiKey=$SIGNOZ_KEY" --dry-run
87+
8488
# upgrade elasticsearch operator
8589
# https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-quickstart.html
8690
# https://github.com/elastic/cloud-on-k8s/releases
87-
kubectl replace -f https://download.elastic.co/downloads/eck/2.15.0/crds.yaml
88-
kubectl create -f https://download.elastic.co/downloads/eck/2.15.0/crds.yaml
89-
kubectl apply -f https://download.elastic.co/downloads/eck/2.15.0/operator.yaml
91+
kubectl replace -f https://download.elastic.co/downloads/eck/2.16.1/crds.yaml
92+
kubectl create -f https://download.elastic.co/downloads/eck/2.16.1/crds.yaml
93+
kubectl apply -f https://download.elastic.co/downloads/eck/2.16.1/operator.yaml
9094

9195
# upgrade elasticsearch
9296
kubectl apply --namespace ex-prod -f ex-prod-elasticsearch.yaml
@@ -95,7 +99,7 @@ kubectl apply --namespace ex-prod -f ex-prod-elasticsearch.yaml
9599
kubectl apply --namespace elastic-system -f elastic-monitor.yaml
96100

97101
# upgrade exceptionless app to a new docker image tag
98-
$VERSION="8.0.0"
102+
$VERSION = "8.0.0"
99103
helm upgrade --set "version=$VERSION" --reuse-values ex-prod --namespace ex-prod .\exceptionless
100104
helm upgrade --reuse-values ex-prod --namespace ex-prod .\exceptionless
101105
# see what an upgrade will do

0 commit comments

Comments
 (0)