diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 4fc8ce163f..1ba2a33c05 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -22,7 +22,7 @@ services: # (Adding the "ports" property to this file will not forward from a Codespace.) elasticsearch: - image: exceptionless/elasticsearch:8.9.0 + image: exceptionless/elasticsearch:8.10.3 environment: node.name: elasticsearch cluster.name: exceptionless @@ -38,7 +38,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:8.9.0 + image: docker.elastic.co/kibana/kibana:8.10.3 environment: xpack.security.enabled: "false" ports: diff --git a/Dockerfile b/Dockerfile index 1126e1b814..1004525919 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /app -ENV HUSKY 0 - COPY ./*.sln ./NuGet.Config ./ COPY ./src/*.props ./src/ COPY ./tests/*.props ./tests/ @@ -42,7 +40,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS job WORKDIR /app COPY --from=job-publish /app/src/Exceptionless.Job/out ./ -EXPOSE 80 443 +EXPOSE 8080 ENTRYPOINT [ "dotnet", "Exceptionless.Job.dll" ] @@ -62,7 +60,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS api WORKDIR /app COPY --from=api-publish /app/src/Exceptionless.Web/out ./ -EXPOSE 80 443 +EXPOSE 8080 ENTRYPOINT [ "dotnet", "Exceptionless.Web.dll" ] @@ -93,7 +91,7 @@ ENV EX_ConnectionStrings__Storage=provider=folder;path=/app/storage \ RUN chmod +x /app/app-docker-entrypoint.sh RUN chmod +x /usr/local/bin/update-config -EXPOSE 80 443 +EXPOSE 8080 ENTRYPOINT ["/app/app-docker-entrypoint.sh"] @@ -149,7 +147,7 @@ RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \ ./dotnet-install.sh --channel 8.0 --quality preview --runtime aspnetcore && \ rm dotnet-install.sh -EXPOSE 80 443 9200 +EXPOSE 8080 9200 ENTRYPOINT ["/app/docker-entrypoint.sh"] @@ -205,7 +203,7 @@ RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \ ./dotnet-install.sh --channel 8.0 --quality preview --runtime aspnetcore && \ rm dotnet-install.sh -EXPOSE 80 443 9200 +EXPOSE 8080 9200 ENTRYPOINT ["/app/docker-entrypoint.sh"] diff --git a/docker/docker-compose.7x.yml b/docker/docker-compose.7x.yml index 8b364ebb4d..9f80417145 100644 --- a/docker/docker-compose.7x.yml +++ b/docker/docker-compose.7x.yml @@ -2,7 +2,7 @@ version: "2.2" services: elasticsearch: - image: exceptionless/elasticsearch:7.17.12 + image: exceptionless/elasticsearch:7.17.14 environment: discovery.type: single-node xpack.security.enabled: "false" @@ -16,7 +16,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:7.17.12 + image: docker.elastic.co/kibana/kibana:7.17.14 ports: - 5601:5601 diff --git a/docker/docker-compose.apm.yml b/docker/docker-compose.apm.yml index 200ab22cea..24587b6155 100644 --- a/docker/docker-compose.apm.yml +++ b/docker/docker-compose.apm.yml @@ -2,7 +2,7 @@ version: "2.2" services: setup: - image: docker.elastic.co/elasticsearch/elasticsearch:8.9.0 + image: docker.elastic.co/elasticsearch/elasticsearch:8.10.3 volumes: - certs:/usr/share/elasticsearch/config/certs user: "0" @@ -53,7 +53,7 @@ services: depends_on: setup: condition: service_healthy - image: docker.elastic.co/elasticsearch/elasticsearch:8.9.0 + image: docker.elastic.co/elasticsearch/elasticsearch:8.10.3 volumes: - certs:/usr/share/elasticsearch/config/certs - esdata:/usr/share/elasticsearch/data @@ -98,7 +98,7 @@ services: depends_on: elasticsearch: condition: service_healthy - image: docker.elastic.co/kibana/kibana:8.9.0 + image: docker.elastic.co/kibana/kibana:8.10.3 volumes: - certs:/usr/share/kibana/config/certs ports: @@ -124,7 +124,7 @@ services: depends_on: elasticsearch: condition: service_healthy - image: docker.elastic.co/apm/apm-server:8.9.0 + image: docker.elastic.co/apm/apm-server:8.10.3 volumes: - certs:/usr/share/apm-server/certs ports: diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 9d8ce8a7b2..8e0e246a31 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -50,7 +50,7 @@ services: - appdata:/app/storage elasticsearch: - image: exceptionless/elasticsearch:7.17.12 + image: exceptionless/elasticsearch:7.17.14 environment: discovery.type: single-node xpack.security.enabled: "false" @@ -64,7 +64,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:7.17.12 + image: docker.elastic.co/kibana/kibana:7.17.14 ports: - 5601:5601 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c4f9cd5f5b..5eea80ee2c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,7 +2,7 @@ version: "2.2" services: elasticsearch: - image: exceptionless/elasticsearch:8.9.0 + image: exceptionless/elasticsearch:8.10.3 environment: node.name: elasticsearch cluster.name: exceptionless @@ -18,7 +18,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:8.9.0 + image: docker.elastic.co/kibana/kibana:8.10.3 environment: xpack.security.enabled: "false" ports: diff --git a/k8s/elastic-monitor.yaml b/k8s/elastic-monitor.yaml index f317bd8025..a08ab4e78e 100644 --- a/k8s/elastic-monitor.yaml +++ b/k8s/elastic-monitor.yaml @@ -4,7 +4,7 @@ metadata: name: elastic-monitor namespace: elastic-system spec: - version: 8.9.0 + version: 8.10.3 nodeSets: - name: main count: 2 @@ -50,7 +50,7 @@ metadata: name: kibana-monitor namespace: elastic-system spec: - version: 8.9.0 + version: 8.10.3 count: 1 elasticsearchRef: name: elastic-monitor @@ -144,7 +144,7 @@ metadata: name: fleet-server namespace: elastic-system spec: - version: 8.9.0 + version: 8.10.3 kibanaRef: name: kibana-monitor elasticsearchRefs: @@ -168,7 +168,7 @@ metadata: name: elastic-agent namespace: elastic-system spec: - version: 8.9.0 + version: 8.10.3 kibanaRef: name: kibana-monitor fleetServerRef: diff --git a/k8s/ex-dev-elasticsearch.yaml b/k8s/ex-dev-elasticsearch.yaml index efe54499a0..c6dd34b698 100644 --- a/k8s/ex-dev-elasticsearch.yaml +++ b/k8s/ex-dev-elasticsearch.yaml @@ -4,8 +4,8 @@ metadata: name: ex-dev namespace: ex-dev spec: - version: 8.9.0 - image: exceptionless/elasticsearch:8.9.0 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch + version: 8.10.3 + image: exceptionless/elasticsearch:8.10.3 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch secureSettings: - secretName: ex-dev-snapshots http: @@ -57,7 +57,7 @@ metadata: name: ex-dev namespace: ex-dev spec: - version: 8.9.0 + version: 8.10.3 count: 1 elasticsearchRef: name: ex-dev diff --git a/k8s/ex-prod-elasticsearch.yaml b/k8s/ex-prod-elasticsearch.yaml index efe2c0be30..80ffa25da3 100644 --- a/k8s/ex-prod-elasticsearch.yaml +++ b/k8s/ex-prod-elasticsearch.yaml @@ -4,8 +4,8 @@ metadata: name: ex-prod namespace: ex-prod spec: - version: 8.9.0 - image: exceptionless/elasticsearch:8.9.0 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch + version: 8.10.3 + image: exceptionless/elasticsearch:8.10.3 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch monitoring: metrics: elasticsearchRefs: @@ -68,7 +68,7 @@ metadata: name: ex-prod namespace: ex-prod spec: - version: 8.9.0 + version: 8.10.3 count: 1 elasticsearchRef: name: ex-prod diff --git a/k8s/exceptionless/templates/api.yaml b/k8s/exceptionless/templates/api.yaml index 277b11e066..4d740caa26 100644 --- a/k8s/exceptionless/templates/api.yaml +++ b/k8s/exceptionless/templates/api.yaml @@ -33,13 +33,13 @@ spec: livenessProbe: httpGet: path: /health - port: 80 + port: 8080 initialDelaySeconds: 10 periodSeconds: 10 readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 3 periodSeconds: 3 resources: @@ -51,7 +51,7 @@ spec: cpu: 800m ports: - name: http - containerPort: 80 + containerPort: 8080 protocol: TCP envFrom: - configMapRef: diff --git a/k8s/exceptionless/templates/app.yaml b/k8s/exceptionless/templates/app.yaml index d1431d844c..ead83f3e75 100644 --- a/k8s/exceptionless/templates/app.yaml +++ b/k8s/exceptionless/templates/app.yaml @@ -33,13 +33,13 @@ spec: livenessProbe: httpGet: path: /health - port: 80 + port: 8080 initialDelaySeconds: 10 periodSeconds: 10 readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 3 periodSeconds: 3 resources: @@ -51,7 +51,7 @@ spec: cpu: 500m ports: - name: http - containerPort: 80 + containerPort: 8080 protocol: TCP envFrom: - configMapRef: diff --git a/k8s/exceptionless/templates/jobs.yaml b/k8s/exceptionless/templates/jobs.yaml index 32e79c733f..8ee285f014 100644 --- a/k8s/exceptionless/templates/jobs.yaml +++ b/k8s/exceptionless/templates/jobs.yaml @@ -10,7 +10,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ if not (kindIs "invalid" ( .Values.jobs.closeInactiveSessions | default dict ).replicaCount) }}{{ .Values.jobs.closeInactiveSessions.replicaCount }}{{ else }}{{ 1 }}{{ end }} + replicas: {{ if not (kindIs "invalid" ( .Values.jobs.closeInactiveSessions | default dict ).replicaCount) }}{{ .Values.jobs.closeInactiveSessions.replicaCount }}{{ else }}{{ 1 }}{{ end }} selector: matchLabels: component: {{ template "exceptionless.fullname" . }}-jobs-close-inactive-sessions @@ -61,7 +61,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ if not (kindIs "invalid" ( .Values.jobs.dailySummary | default dict ).replicaCount) }}{{ .Values.jobs.dailySummary.replicaCount }}{{ else }}{{ 1 }}{{ end }} + replicas: {{ if not (kindIs "invalid" ( .Values.jobs.dailySummary | default dict ).replicaCount) }}{{ .Values.jobs.dailySummary.replicaCount }}{{ else }}{{ 1 }}{{ end }} selector: matchLabels: component: {{ template "exceptionless.fullname" . }}-jobs-daily-summary @@ -154,7 +154,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ if not (kindIs "invalid" ( .Values.jobs.eventNotifications | default dict ).replicaCount) }}{{ .Values.jobs.eventNotifications.replicaCount }}{{ else }}{{ 1 }}{{ end }} + replicas: {{ if not (kindIs "invalid" ( .Values.jobs.eventNotifications | default dict ).replicaCount) }}{{ .Values.jobs.eventNotifications.replicaCount }}{{ else }}{{ 1 }}{{ end }} selector: matchLabels: component: {{ template "exceptionless.fullname" . }}-jobs-event-notifications @@ -205,7 +205,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ if not (kindIs "invalid" ( .Values.jobs.eventPosts | default dict ).replicaCount) }}{{ .Values.jobs.eventPosts.replicaCount }}{{ else }}{{ 1 }}{{ end }} + replicas: {{ if not (kindIs "invalid" ( .Values.jobs.eventPosts | default dict ).replicaCount) }}{{ .Values.jobs.eventPosts.replicaCount }}{{ else }}{{ 1 }}{{ end }} selector: matchLabels: component: {{ template "exceptionless.fullname" . }}-jobs-event-posts @@ -228,7 +228,7 @@ spec: livenessProbe: httpGet: path: /health - port: 80 + port: 8080 initialDelaySeconds: 10 periodSeconds: 10 resources: @@ -292,7 +292,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ if not (kindIs "invalid" ( .Values.jobs.eventUserDescriptions | default dict ).replicaCount) }}{{ .Values.jobs.eventUserDescriptions.replicaCount }}{{ else }}{{ 1 }}{{ end }} + replicas: {{ if not (kindIs "invalid" ( .Values.jobs.eventUserDescriptions | default dict ).replicaCount) }}{{ .Values.jobs.eventUserDescriptions.replicaCount }}{{ else }}{{ 1 }}{{ end }} selector: matchLabels: component: {{ template "exceptionless.fullname" . }}-jobs-event-user-descriptions @@ -315,7 +315,7 @@ spec: livenessProbe: httpGet: path: /health - port: 80 + port: 8080 initialDelaySeconds: 10 periodSeconds: 10 resources: @@ -343,7 +343,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ if not (kindIs "invalid" ( .Values.jobs.mailMessage | default dict ).replicaCount) }}{{ .Values.jobs.mailMessage.replicaCount }}{{ else }}{{ 1 }}{{ end }} + replicas: {{ if not (kindIs "invalid" ( .Values.jobs.mailMessage | default dict ).replicaCount) }}{{ .Values.jobs.mailMessage.replicaCount }}{{ else }}{{ 1 }}{{ end }} selector: matchLabels: component: {{ template "exceptionless.fullname" . }}-jobs-mail-message @@ -366,7 +366,7 @@ spec: livenessProbe: httpGet: path: /health - port: 80 + port: 8080 initialDelaySeconds: 10 periodSeconds: 10 resources: @@ -407,7 +407,7 @@ spec: livenessProbe: httpGet: path: /health - port: 80 + port: 8080 initialDelaySeconds: 10 periodSeconds: 10 resources: @@ -449,7 +449,7 @@ spec: livenessProbe: httpGet: path: /health - port: 80 + port: 8080 initialDelaySeconds: 10 periodSeconds: 10 resources: @@ -491,7 +491,7 @@ spec: livenessProbe: httpGet: path: /health - port: 80 + port: 8080 initialDelaySeconds: 10 periodSeconds: 10 resources: @@ -520,7 +520,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ if not (kindIs "invalid" ( .Values.jobs.stackEventCount | default dict ).replicaCount) }}{{ .Values.jobs.stackEventCount.replicaCount }}{{ else }}{{ 1 }}{{ end }} + replicas: {{ if not (kindIs "invalid" ( .Values.jobs.stackEventCount | default dict ).replicaCount) }}{{ .Values.jobs.stackEventCount.replicaCount }}{{ else }}{{ 1 }}{{ end }} selector: matchLabels: component: {{ template "exceptionless.fullname" . }}-jobs-stack-event-count @@ -543,7 +543,7 @@ spec: livenessProbe: httpGet: path: /health - port: 80 + port: 8080 initialDelaySeconds: 10 periodSeconds: 10 resources: @@ -571,7 +571,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ if not (kindIs "invalid" ( .Values.jobs.webhooks | default dict ).replicaCount) }}{{ .Values.jobs.webhooks.replicaCount }}{{ else }}{{ 1 }}{{ end }} + replicas: {{ if not (kindIs "invalid" ( .Values.jobs.webhooks | default dict ).replicaCount) }}{{ .Values.jobs.webhooks.replicaCount }}{{ else }}{{ 1 }}{{ end }} selector: matchLabels: component: {{ template "exceptionless.fullname" . }}-jobs-web-hooks @@ -594,7 +594,7 @@ spec: livenessProbe: httpGet: path: /health - port: 80 + port: 8080 initialDelaySeconds: 10 periodSeconds: 10 resources: @@ -622,7 +622,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ if not (kindIs "invalid" ( .Values.jobs.workitem | default dict ).replicaCount) }}{{ .Values.jobs.workitem.replicaCount }}{{ else }}{{ 1 }}{{ end }} + replicas: {{ if not (kindIs "invalid" ( .Values.jobs.workitem | default dict ).replicaCount) }}{{ .Values.jobs.workitem.replicaCount }}{{ else }}{{ 1 }}{{ end }} selector: matchLabels: component: {{ template "exceptionless.fullname" . }}-jobs-work-item @@ -645,7 +645,7 @@ spec: livenessProbe: httpGet: path: /health - port: 80 + port: 8080 initialDelaySeconds: 10 periodSeconds: 10 resources: @@ -682,7 +682,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ if not (kindIs "invalid" ( .Values.jobs.eventUsage | default dict ).replicaCount) }}{{ .Values.jobs.eventUsage.replicaCount }}{{ else }}{{ 1 }}{{ end }} + replicas: {{ if not (kindIs "invalid" ( .Values.jobs.eventUsage | default dict ).replicaCount) }}{{ .Values.jobs.eventUsage.replicaCount }}{{ else }}{{ 1 }}{{ end }} selector: matchLabels: component: {{ template "exceptionless.fullname" . }}-jobs-event-usage @@ -705,7 +705,7 @@ spec: livenessProbe: httpGet: path: /health - port: 80 + port: 8080 initialDelaySeconds: 10 periodSeconds: 10 resources: diff --git a/k8s/exceptionless/values.yaml b/k8s/exceptionless/values.yaml index 7d5606b6db..9c97c6776d 100644 --- a/k8s/exceptionless/values.yaml +++ b/k8s/exceptionless/values.yaml @@ -51,7 +51,7 @@ elasticsearch: connectionString: image: repository: exceptionless/elasticsearch - tag: 8.9.0 + tag: 8.10.3 pullPolicy: IfNotPresent redis: diff --git a/samples/docker-compose.all-in-one.yml b/samples/docker-compose.all-in-one.yml index 3e25d17786..8a1a9f6109 100644 --- a/samples/docker-compose.all-in-one.yml +++ b/samples/docker-compose.all-in-one.yml @@ -20,7 +20,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:8.9.0 + image: docker.elastic.co/kibana/kibana:8.10.3 ports: - 5601:5601 diff --git a/samples/docker-compose.yml b/samples/docker-compose.yml index b5ea4f4b20..518f77877b 100644 --- a/samples/docker-compose.yml +++ b/samples/docker-compose.yml @@ -45,7 +45,7 @@ services: - ex_appdata:/app/storage elasticsearch: - image: exceptionless/elasticsearch:8.9.0 + image: exceptionless/elasticsearch:8.10.3 environment: discovery.type: single-node xpack.security.enabled: "false" @@ -59,7 +59,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:8.9.0 + image: docker.elastic.co/kibana/kibana:8.10.3 ports: - 5601:5601