diff --git a/CHANGELOG.md b/CHANGELOG.md index aeadd5722ea..63503de99fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -218,6 +218,7 @@ * `-distributor.sharding-strategy` option has been removed, and shuffle sharding is enabled by default. Default shard size is set to 0, which disables shuffle sharding for the tenant (all ingesters will receive tenants's samples). #888 * `-ruler.sharding-strategy` option has been removed from ruler. Ruler now uses shuffle-sharding by default, but respects `ruler_tenant_shard_size`, which defaults to 0 (ie. use all rulers for tenant). #889 * `-store-gateway.sharding-strategy` option has been removed store-gateways. Store-gateway now uses shuffle-sharding by default, but respects `store_gateway_tenant_shard_size` for tenant, and this value defaults to 0. #891 +* [CHANGE] Server: `-server.http-listen-port` (yaml: `server.http_listen_port`) now defaults to `8080` (previously `80`). #871 * [FEATURE] Query Frontend: Add `cortex_query_fetched_chunks_total` per-user counter to expose the number of chunks fetched as part of queries. This metric can be enabled with the `-frontend.query-stats-enabled` flag (or its respective YAML config option `query_stats_enabled`). #31 * [FEATURE] Query Frontend: Add experimental querysharding for the blocks storage (instant and range queries). You can now enable querysharding for blocks storage (`-store.engine=blocks`) by setting `-frontend.parallelize-shardable-queries` to `true`. The following additional config and exported metrics have been added. #79 #80 #100 #124 #140 #148 #150 #151 #153 #154 #155 #156 #157 #158 #159 #160 #163 #169 #172 #196 #205 #225 #226 #227 #228 #230 #235 #240 #239 #246 #244 #319 #330 #371 #385 #400 #458 #586 #630 #660 #707 * New config options: diff --git a/cmd/mimir/Dockerfile b/cmd/mimir/Dockerfile index 53d04ffda97..934221b53db 100644 --- a/cmd/mimir/Dockerfile +++ b/cmd/mimir/Dockerfile @@ -12,7 +12,7 @@ ARG BINARY_SUFFIX="_${TARGETOS}_${TARGETARCH}" # Set to non-empty value to use ${TARGET_SUFFIX} when copying mimir binary, leave unset to use no suffix. ARG USE_BINARY_SUFFIX COPY mimir${USE_BINARY_SUFFIX:+${BINARY_SUFFIX}} /bin/mimir -EXPOSE 80 +EXPOSE 8080 ENTRYPOINT [ "/bin/mimir" ] ARG revision diff --git a/docs/sources/configuration/config-file-reference.md b/docs/sources/configuration/config-file-reference.md index 37bec90d3ff..9d9dfe397bb 100644 --- a/docs/sources/configuration/config-file-reference.md +++ b/docs/sources/configuration/config-file-reference.md @@ -273,7 +273,7 @@ The `server_config` configures the HTTP and gRPC server of the launched service( # HTTP server listen port. # CLI flag: -server.http-listen-port -[http_listen_port: | default = 80] +[http_listen_port: | default = 8080] # Maximum number of simultaneous http connections, <=0 to disable # CLI flag: -server.http-conn-limit diff --git a/docs/sources/operations/requests-mirroring-envoy.yaml b/docs/sources/operations/requests-mirroring-envoy.yaml index 377a5e08b74..47ec01eeb89 100644 --- a/docs/sources/operations/requests-mirroring-envoy.yaml +++ b/docs/sources/operations/requests-mirroring-envoy.yaml @@ -40,10 +40,10 @@ static_resources: - name: cortex_primary type: STRICT_DNS connect_timeout: 1s - hosts: [{ socket_address: { address: cortex-primary, port_value: 80 }}] + hosts: [{ socket_address: { address: cortex-primary, port_value: 8080 }}] dns_refresh_rate: 5s - name: cortex_secondary type: STRICT_DNS connect_timeout: 1s - hosts: [{ socket_address: { address: cortex-secondary, port_value: 80 }}] + hosts: [{ socket_address: { address: cortex-secondary, port_value: 8080 }}] dns_refresh_rate: 5s diff --git a/docs/sources/operations/requests-mirroring-to-secondary-cluster.md b/docs/sources/operations/requests-mirroring-to-secondary-cluster.md index 211dd99cd21..9387954f02e 100644 --- a/docs/sources/operations/requests-mirroring-to-secondary-cluster.md +++ b/docs/sources/operations/requests-mirroring-to-secondary-cluster.md @@ -15,7 +15,7 @@ For example, requests mirroring can be used when you need to setup a testing Cor ### Example Envoy config -The following Envoy configuration shows an example with two Cortex clusters. Envoy will listen on port `9900` and will proxies all requests to `cortex-primary:80`, mirroring it to `cortex-secondary:80` too. +The following Envoy configuration shows an example with two Cortex clusters. Envoy will listen on port `9900` and will proxies all requests to `cortex-primary:8080`, mirroring it to `cortex-secondary:8080` too. [embedmd]:# (./requests-mirroring-envoy.yaml) @@ -62,12 +62,12 @@ static_resources: - name: cortex_primary type: STRICT_DNS connect_timeout: 1s - hosts: [{ socket_address: { address: cortex-primary, port_value: 80 }}] + hosts: [{ socket_address: { address: cortex-primary, port_value: 8080 }}] dns_refresh_rate: 5s - name: cortex_secondary type: STRICT_DNS connect_timeout: 1s - hosts: [{ socket_address: { address: cortex-secondary, port_value: 80 }}] + hosts: [{ socket_address: { address: cortex-secondary, port_value: 8080 }}] dns_refresh_rate: 5s ``` diff --git a/integration/backward_compatibility.go b/integration/backward_compatibility.go index cf5883f1c40..2bce150f132 100644 --- a/integration/backward_compatibility.go +++ b/integration/backward_compatibility.go @@ -7,6 +7,7 @@ package integration var DefaultPreviousVersionImages = map[string]func(map[string]string) map[string]string{ "quay.io/cortexproject/cortex:v1.11.0": func(flags map[string]string) map[string]string { flags["-store.engine"] = "blocks" + flags["-server.http-listen-port"] = "8080" return flags }, } diff --git a/integration/e2emimir/services.go b/integration/e2emimir/services.go index be798ef34a1..aee51eeb7c6 100644 --- a/integration/e2emimir/services.go +++ b/integration/e2emimir/services.go @@ -14,7 +14,7 @@ import ( ) const ( - httpPort = 80 + httpPort = 8080 grpcPort = 9095 GossipPort = 9094 ) diff --git a/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml b/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml index 2e9454eff5b..aaf15530134 100644 --- a/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml +++ b/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml @@ -301,8 +301,8 @@ spec: clusterIP: None ports: - name: alertmanager-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: alertmanager-grpc port: 9095 targetPort: 9095 @@ -350,8 +350,8 @@ spec: clusterIP: None ports: - name: distributor-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: distributor-grpc port: 9095 targetPort: 9095 @@ -368,8 +368,8 @@ metadata: spec: ports: - name: ingester-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: ingester-grpc port: 9095 targetPort: 9095 @@ -462,8 +462,8 @@ metadata: spec: ports: - name: querier-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: querier-grpc port: 9095 targetPort: 9095 @@ -480,8 +480,8 @@ metadata: spec: ports: - name: query-frontend-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-frontend-grpc port: 9095 targetPort: 9095 @@ -499,8 +499,8 @@ spec: clusterIP: None ports: - name: query-frontend-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-frontend-grpc port: 9095 targetPort: 9095 @@ -518,8 +518,8 @@ metadata: spec: ports: - name: query-scheduler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-scheduler-grpc port: 9095 targetPort: 9095 @@ -537,8 +537,8 @@ spec: clusterIP: None ports: - name: query-scheduler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-scheduler-grpc port: 9095 targetPort: 9095 @@ -556,8 +556,8 @@ metadata: spec: ports: - name: ruler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: ruler-grpc port: 9095 targetPort: 9095 @@ -574,8 +574,8 @@ metadata: spec: ports: - name: store-gateway-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: store-gateway-grpc port: 9095 targetPort: 9095 @@ -760,19 +760,20 @@ spec: - -server.grpc.keepalive.max-connection-idle=1m - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=distributor image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: distributor ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -848,6 +849,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -server.http-write-timeout=1m - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 @@ -863,14 +865,14 @@ spec: imagePullPolicy: IfNotPresent name: querier ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -931,6 +933,7 @@ spec: - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -server.http-write-timeout=1m - -store.max-query-length=12000h - -target=query-frontend @@ -938,14 +941,14 @@ spec: imagePullPolicy: IfNotPresent name: query-frontend ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -996,19 +999,20 @@ spec: - -query-scheduler.max-outstanding-requests-per-tenant=100 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=query-scheduler image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: query-scheduler ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1090,6 +1094,7 @@ spec: - -server.grpc-max-send-msg-size-bytes=10485760 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 - -store-gateway.sharding-ring.prefix= @@ -1101,14 +1106,14 @@ spec: imagePullPolicy: IfNotPresent name: ruler ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1160,6 +1165,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=alertmanager env: - name: POD_IP @@ -1170,14 +1176,14 @@ spec: imagePullPolicy: IfNotPresent name: alertmanager ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1252,19 +1258,20 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=compactor image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: compactor ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1352,19 +1359,20 @@ spec: - -server.grpc-max-send-msg-size-bytes=10485760 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=ingester image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: ingester ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1672,6 +1680,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 - -store-gateway.sharding-ring.prefix= @@ -1683,14 +1692,14 @@ spec: imagePullPolicy: IfNotPresent name: store-gateway ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: diff --git a/operations/mimir-tests/test-query-sharding-generated.yaml b/operations/mimir-tests/test-query-sharding-generated.yaml index df115929ad6..cfdd56fea2b 100644 --- a/operations/mimir-tests/test-query-sharding-generated.yaml +++ b/operations/mimir-tests/test-query-sharding-generated.yaml @@ -300,8 +300,8 @@ spec: clusterIP: None ports: - name: alertmanager-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: alertmanager-grpc port: 9095 targetPort: 9095 @@ -349,8 +349,8 @@ spec: clusterIP: None ports: - name: distributor-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: distributor-grpc port: 9095 targetPort: 9095 @@ -367,8 +367,8 @@ metadata: spec: ports: - name: ingester-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: ingester-grpc port: 9095 targetPort: 9095 @@ -461,8 +461,8 @@ metadata: spec: ports: - name: querier-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: querier-grpc port: 9095 targetPort: 9095 @@ -479,8 +479,8 @@ metadata: spec: ports: - name: query-frontend-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-frontend-grpc port: 9095 targetPort: 9095 @@ -498,8 +498,8 @@ spec: clusterIP: None ports: - name: query-frontend-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-frontend-grpc port: 9095 targetPort: 9095 @@ -517,8 +517,8 @@ metadata: spec: ports: - name: query-scheduler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-scheduler-grpc port: 9095 targetPort: 9095 @@ -536,8 +536,8 @@ spec: clusterIP: None ports: - name: query-scheduler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-scheduler-grpc port: 9095 targetPort: 9095 @@ -555,8 +555,8 @@ metadata: spec: ports: - name: ruler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: ruler-grpc port: 9095 targetPort: 9095 @@ -573,8 +573,8 @@ metadata: spec: ports: - name: store-gateway-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: store-gateway-grpc port: 9095 targetPort: 9095 @@ -759,19 +759,20 @@ spec: - -server.grpc.keepalive.max-connection-idle=1m - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=distributor image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: distributor ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -847,6 +848,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -server.http-write-timeout=1m - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 @@ -862,14 +864,14 @@ spec: imagePullPolicy: IfNotPresent name: querier ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -934,6 +936,7 @@ spec: - -server.grpc-max-recv-msg-size-bytes=419430400 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -server.http-write-timeout=1m - -store.max-query-length=12000h - -target=query-frontend @@ -941,14 +944,14 @@ spec: imagePullPolicy: IfNotPresent name: query-frontend ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -999,19 +1002,20 @@ spec: - -query-scheduler.max-outstanding-requests-per-tenant=800 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=query-scheduler image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: query-scheduler ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1093,6 +1097,7 @@ spec: - -server.grpc-max-send-msg-size-bytes=10485760 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 - -store-gateway.sharding-ring.prefix= @@ -1104,14 +1109,14 @@ spec: imagePullPolicy: IfNotPresent name: ruler ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1163,6 +1168,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=alertmanager env: - name: POD_IP @@ -1173,14 +1179,14 @@ spec: imagePullPolicy: IfNotPresent name: alertmanager ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1255,19 +1261,20 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=compactor image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: compactor ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1355,19 +1362,20 @@ spec: - -server.grpc-max-send-msg-size-bytes=10485760 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=ingester image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: ingester ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1675,6 +1683,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 - -store-gateway.sharding-ring.prefix= @@ -1686,14 +1695,14 @@ spec: imagePullPolicy: IfNotPresent name: store-gateway ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: diff --git a/operations/mimir-tests/test-storage-azure-generated.yaml b/operations/mimir-tests/test-storage-azure-generated.yaml index 8ec0dfa425f..a8613b230fd 100644 --- a/operations/mimir-tests/test-storage-azure-generated.yaml +++ b/operations/mimir-tests/test-storage-azure-generated.yaml @@ -300,8 +300,8 @@ spec: clusterIP: None ports: - name: alertmanager-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: alertmanager-grpc port: 9095 targetPort: 9095 @@ -349,8 +349,8 @@ spec: clusterIP: None ports: - name: distributor-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: distributor-grpc port: 9095 targetPort: 9095 @@ -367,8 +367,8 @@ metadata: spec: ports: - name: ingester-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: ingester-grpc port: 9095 targetPort: 9095 @@ -461,8 +461,8 @@ metadata: spec: ports: - name: querier-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: querier-grpc port: 9095 targetPort: 9095 @@ -479,8 +479,8 @@ metadata: spec: ports: - name: query-frontend-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-frontend-grpc port: 9095 targetPort: 9095 @@ -498,8 +498,8 @@ spec: clusterIP: None ports: - name: query-frontend-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-frontend-grpc port: 9095 targetPort: 9095 @@ -517,8 +517,8 @@ metadata: spec: ports: - name: query-scheduler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-scheduler-grpc port: 9095 targetPort: 9095 @@ -536,8 +536,8 @@ spec: clusterIP: None ports: - name: query-scheduler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-scheduler-grpc port: 9095 targetPort: 9095 @@ -555,8 +555,8 @@ metadata: spec: ports: - name: ruler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: ruler-grpc port: 9095 targetPort: 9095 @@ -573,8 +573,8 @@ metadata: spec: ports: - name: store-gateway-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: store-gateway-grpc port: 9095 targetPort: 9095 @@ -759,19 +759,20 @@ spec: - -server.grpc.keepalive.max-connection-idle=1m - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=distributor image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: distributor ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -849,6 +850,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -server.http-write-timeout=1m - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 @@ -864,14 +866,14 @@ spec: imagePullPolicy: IfNotPresent name: querier ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -932,6 +934,7 @@ spec: - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -server.http-write-timeout=1m - -store.max-query-length=12000h - -target=query-frontend @@ -939,14 +942,14 @@ spec: imagePullPolicy: IfNotPresent name: query-frontend ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -997,19 +1000,20 @@ spec: - -query-scheduler.max-outstanding-requests-per-tenant=100 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=query-scheduler image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: query-scheduler ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1095,6 +1099,7 @@ spec: - -server.grpc-max-send-msg-size-bytes=10485760 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 - -store-gateway.sharding-ring.prefix= @@ -1106,14 +1111,14 @@ spec: imagePullPolicy: IfNotPresent name: ruler ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1167,6 +1172,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=alertmanager env: - name: POD_IP @@ -1177,14 +1183,14 @@ spec: imagePullPolicy: IfNotPresent name: alertmanager ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1261,19 +1267,20 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=compactor image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: compactor ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1363,19 +1370,20 @@ spec: - -server.grpc-max-send-msg-size-bytes=10485760 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=ingester image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: ingester ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1685,6 +1693,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 - -store-gateway.sharding-ring.prefix= @@ -1696,14 +1705,14 @@ spec: imagePullPolicy: IfNotPresent name: store-gateway ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: diff --git a/operations/mimir-tests/test-storage-gcs-generated.yaml b/operations/mimir-tests/test-storage-gcs-generated.yaml index 0f64ab68c9a..646fd58b382 100644 --- a/operations/mimir-tests/test-storage-gcs-generated.yaml +++ b/operations/mimir-tests/test-storage-gcs-generated.yaml @@ -300,8 +300,8 @@ spec: clusterIP: None ports: - name: alertmanager-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: alertmanager-grpc port: 9095 targetPort: 9095 @@ -349,8 +349,8 @@ spec: clusterIP: None ports: - name: distributor-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: distributor-grpc port: 9095 targetPort: 9095 @@ -367,8 +367,8 @@ metadata: spec: ports: - name: ingester-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: ingester-grpc port: 9095 targetPort: 9095 @@ -461,8 +461,8 @@ metadata: spec: ports: - name: querier-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: querier-grpc port: 9095 targetPort: 9095 @@ -479,8 +479,8 @@ metadata: spec: ports: - name: query-frontend-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-frontend-grpc port: 9095 targetPort: 9095 @@ -498,8 +498,8 @@ spec: clusterIP: None ports: - name: query-frontend-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-frontend-grpc port: 9095 targetPort: 9095 @@ -517,8 +517,8 @@ metadata: spec: ports: - name: query-scheduler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-scheduler-grpc port: 9095 targetPort: 9095 @@ -536,8 +536,8 @@ spec: clusterIP: None ports: - name: query-scheduler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-scheduler-grpc port: 9095 targetPort: 9095 @@ -555,8 +555,8 @@ metadata: spec: ports: - name: ruler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: ruler-grpc port: 9095 targetPort: 9095 @@ -573,8 +573,8 @@ metadata: spec: ports: - name: store-gateway-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: store-gateway-grpc port: 9095 targetPort: 9095 @@ -759,19 +759,20 @@ spec: - -server.grpc.keepalive.max-connection-idle=1m - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=distributor image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: distributor ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -847,6 +848,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -server.http-write-timeout=1m - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 @@ -862,14 +864,14 @@ spec: imagePullPolicy: IfNotPresent name: querier ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -930,6 +932,7 @@ spec: - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -server.http-write-timeout=1m - -store.max-query-length=12000h - -target=query-frontend @@ -937,14 +940,14 @@ spec: imagePullPolicy: IfNotPresent name: query-frontend ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -995,19 +998,20 @@ spec: - -query-scheduler.max-outstanding-requests-per-tenant=100 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=query-scheduler image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: query-scheduler ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1089,6 +1093,7 @@ spec: - -server.grpc-max-send-msg-size-bytes=10485760 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 - -store-gateway.sharding-ring.prefix= @@ -1100,14 +1105,14 @@ spec: imagePullPolicy: IfNotPresent name: ruler ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1159,6 +1164,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=alertmanager env: - name: POD_IP @@ -1169,14 +1175,14 @@ spec: imagePullPolicy: IfNotPresent name: alertmanager ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1251,19 +1257,20 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=compactor image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: compactor ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1351,19 +1358,20 @@ spec: - -server.grpc-max-send-msg-size-bytes=10485760 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=ingester image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: ingester ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1671,6 +1679,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 - -store-gateway.sharding-ring.prefix= @@ -1682,14 +1691,14 @@ spec: imagePullPolicy: IfNotPresent name: store-gateway ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: diff --git a/operations/mimir-tests/test-storage-s3-generated.yaml b/operations/mimir-tests/test-storage-s3-generated.yaml index 33fc81c6f0c..f8053cbd851 100644 --- a/operations/mimir-tests/test-storage-s3-generated.yaml +++ b/operations/mimir-tests/test-storage-s3-generated.yaml @@ -300,8 +300,8 @@ spec: clusterIP: None ports: - name: alertmanager-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: alertmanager-grpc port: 9095 targetPort: 9095 @@ -349,8 +349,8 @@ spec: clusterIP: None ports: - name: distributor-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: distributor-grpc port: 9095 targetPort: 9095 @@ -367,8 +367,8 @@ metadata: spec: ports: - name: ingester-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: ingester-grpc port: 9095 targetPort: 9095 @@ -461,8 +461,8 @@ metadata: spec: ports: - name: querier-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: querier-grpc port: 9095 targetPort: 9095 @@ -479,8 +479,8 @@ metadata: spec: ports: - name: query-frontend-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-frontend-grpc port: 9095 targetPort: 9095 @@ -498,8 +498,8 @@ spec: clusterIP: None ports: - name: query-frontend-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-frontend-grpc port: 9095 targetPort: 9095 @@ -517,8 +517,8 @@ metadata: spec: ports: - name: query-scheduler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-scheduler-grpc port: 9095 targetPort: 9095 @@ -536,8 +536,8 @@ spec: clusterIP: None ports: - name: query-scheduler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: query-scheduler-grpc port: 9095 targetPort: 9095 @@ -555,8 +555,8 @@ metadata: spec: ports: - name: ruler-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: ruler-grpc port: 9095 targetPort: 9095 @@ -573,8 +573,8 @@ metadata: spec: ports: - name: store-gateway-http-metrics - port: 80 - targetPort: 80 + port: 8080 + targetPort: 8080 - name: store-gateway-grpc port: 9095 targetPort: 9095 @@ -759,19 +759,20 @@ spec: - -server.grpc.keepalive.max-connection-idle=1m - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=distributor image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: distributor ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -848,6 +849,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -server.http-write-timeout=1m - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 @@ -863,14 +865,14 @@ spec: imagePullPolicy: IfNotPresent name: querier ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -931,6 +933,7 @@ spec: - -server.grpc-max-recv-msg-size-bytes=104857600 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -server.http-write-timeout=1m - -store.max-query-length=12000h - -target=query-frontend @@ -938,14 +941,14 @@ spec: imagePullPolicy: IfNotPresent name: query-frontend ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -996,19 +999,20 @@ spec: - -query-scheduler.max-outstanding-requests-per-tenant=100 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=query-scheduler image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: query-scheduler ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1093,6 +1097,7 @@ spec: - -server.grpc-max-send-msg-size-bytes=10485760 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 - -store-gateway.sharding-ring.prefix= @@ -1104,14 +1109,14 @@ spec: imagePullPolicy: IfNotPresent name: ruler ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1164,6 +1169,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=alertmanager env: - name: POD_IP @@ -1174,14 +1180,14 @@ spec: imagePullPolicy: IfNotPresent name: alertmanager ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1257,19 +1263,20 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=compactor image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: compactor ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1358,19 +1365,20 @@ spec: - -server.grpc-max-send-msg-size-bytes=10485760 - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -target=ingester image: cortexproject/cortex:v1.9.0 imagePullPolicy: IfNotPresent name: ingester ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: @@ -1679,6 +1687,7 @@ spec: - -runtime-config.file=/etc/mimir/overrides.yaml - -server.grpc.keepalive.min-time-between-pings=10s - -server.grpc.keepalive.ping-without-stream-allowed=true + - -server.http-listen-port=8080 - -store-gateway.sharding-enabled=true - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500 - -store-gateway.sharding-ring.prefix= @@ -1690,14 +1699,14 @@ spec: imagePullPolicy: IfNotPresent name: store-gateway ports: - - containerPort: 80 + - containerPort: 8080 name: http-metrics - containerPort: 9095 name: grpc readinessProbe: httpGet: path: /ready - port: 80 + port: 8080 initialDelaySeconds: 15 timeoutSeconds: 1 resources: diff --git a/operations/mimir/alertmanager.libsonnet b/operations/mimir/alertmanager.libsonnet index 1bc78ff5e07..070a4e46be5 100644 --- a/operations/mimir/alertmanager.libsonnet +++ b/operations/mimir/alertmanager.libsonnet @@ -70,6 +70,7 @@ 'experimental.alertmanager.enable-api': 'true', 'alertmanager.storage.path': '/data', 'alertmanager.web.external-url': '%s/alertmanager' % $._config.external_url, + 'server.http-listen-port': $._config.server_http_port, } + (if hasFallbackConfig then { 'alertmanager.configs.fallback': '/configs/alertmanager_fallback_config.yaml', diff --git a/operations/mimir/common.libsonnet b/operations/mimir/common.libsonnet index 9daf7ee57ea..b714914e95d 100644 --- a/operations/mimir/common.libsonnet +++ b/operations/mimir/common.libsonnet @@ -8,13 +8,13 @@ defaultPorts:: [ - containerPort.newNamed(name='http-metrics', containerPort=80), + containerPort.newNamed(name='http-metrics', containerPort=$._config.server_http_port), containerPort.newNamed(name='grpc', containerPort=9095), ], readinessProbe:: container.mixin.readinessProbe.httpGet.withPath('/ready') + - container.mixin.readinessProbe.httpGet.withPort(80) + + container.mixin.readinessProbe.httpGet.withPort($._config.server_http_port) + container.mixin.readinessProbe.withInitialDelaySeconds(15) + container.mixin.readinessProbe.withTimeoutSeconds(1), }, diff --git a/operations/mimir/compactor.libsonnet b/operations/mimir/compactor.libsonnet index b3e76a7ed4c..ad5ca5a49dc 100644 --- a/operations/mimir/compactor.libsonnet +++ b/operations/mimir/compactor.libsonnet @@ -12,6 +12,8 @@ { target: 'compactor', + 'server.http-listen-port': $._config.server_http_port, + // Compactor config. 'compactor.block-ranges': '2h,12h,24h', 'compactor.data-dir': '/data', diff --git a/operations/mimir/config.libsonnet b/operations/mimir/config.libsonnet index 8409433c023..774917cd7fb 100644 --- a/operations/mimir/config.libsonnet +++ b/operations/mimir/config.libsonnet @@ -184,6 +184,8 @@ }, }[$._config.ruler_client_type], + server_http_port: 8080, + alertmanager: { replicas: 3, sharding_enabled: false, diff --git a/operations/mimir/distributor.libsonnet b/operations/mimir/distributor.libsonnet index 341e3ac14f2..a85d2d1ff1f 100644 --- a/operations/mimir/distributor.libsonnet +++ b/operations/mimir/distributor.libsonnet @@ -24,6 +24,7 @@ // around 1.25G, reducing the 99%ile. 'mem-ballast-size-bytes': 1 << 30, // 1GB + 'server.http-listen-port': $._config.server_http_port, 'server.grpc.keepalive.max-connection-age': '2m', 'server.grpc.keepalive.max-connection-age-grace': '5m', 'server.grpc.keepalive.max-connection-idle': '1m', diff --git a/operations/mimir/ingester.libsonnet b/operations/mimir/ingester.libsonnet index 007a54b73b6..441403f9a61 100644 --- a/operations/mimir/ingester.libsonnet +++ b/operations/mimir/ingester.libsonnet @@ -15,6 +15,8 @@ { target: 'ingester', + 'server.http-listen-port': $._config.server_http_port, + // Ring config. 'ingester.num-tokens': 512, 'ingester.join-after': '0s', diff --git a/operations/mimir/overrides-exporter.libsonnet b/operations/mimir/overrides-exporter.libsonnet index 9a8dd254644..758f27f30f2 100644 --- a/operations/mimir/overrides-exporter.libsonnet +++ b/operations/mimir/overrides-exporter.libsonnet @@ -19,11 +19,13 @@ }, local containerPort = $.core.v1.containerPort, - overrides_exporter_port:: containerPort.newNamed(name='http-metrics', containerPort=80), + overrides_exporter_port:: containerPort.newNamed(name='http-metrics', containerPort=$._config.server_http_port), overrides_exporter_args:: { target: 'overrides-exporter', + 'server.http-listen-port': $._config.server_http_port, + 'runtime-config.file': '%s/overrides.yaml' % $._config.overrides_configmap_mountpoint, } + $._config.limitsConfig, diff --git a/operations/mimir/querier.libsonnet b/operations/mimir/querier.libsonnet index 2ffd6bf2e57..e4eb96079cc 100644 --- a/operations/mimir/querier.libsonnet +++ b/operations/mimir/querier.libsonnet @@ -15,6 +15,8 @@ { target: 'querier', + 'server.http-listen-port': $._config.server_http_port, + // Increase HTTP server response write timeout, as we were seeing some // queries that return a lot of data timeing out. 'server.http-write-timeout': '1m', diff --git a/operations/mimir/query-frontend.libsonnet b/operations/mimir/query-frontend.libsonnet index 5a56b2d7944..05261d7b45b 100644 --- a/operations/mimir/query-frontend.libsonnet +++ b/operations/mimir/query-frontend.libsonnet @@ -9,6 +9,8 @@ // Need log.level=debug so all queries are logged, needed for analyse.py. 'log.level': 'debug', + 'server.http-listen-port': $._config.server_http_port, + // Increase HTTP server response write timeout, as we were seeing some // queries that return a lot of data timeing out. 'server.http-write-timeout': '1m', diff --git a/operations/mimir/query-scheduler.libsonnet b/operations/mimir/query-scheduler.libsonnet index 5b786cb7844..d2401a2176b 100644 --- a/operations/mimir/query-scheduler.libsonnet +++ b/operations/mimir/query-scheduler.libsonnet @@ -10,6 +10,7 @@ { target: 'query-scheduler', 'log.level': 'debug', + 'server.http-listen-port': $._config.server_http_port, 'query-scheduler.max-outstanding-requests-per-tenant': 100, }, diff --git a/operations/mimir/ruler.libsonnet b/operations/mimir/ruler.libsonnet index 9e7e53046b2..438700965ea 100644 --- a/operations/mimir/ruler.libsonnet +++ b/operations/mimir/ruler.libsonnet @@ -29,6 +29,8 @@ 'server.grpc-max-send-msg-size-bytes': 10 * 1024 * 1024, 'server.grpc-max-recv-msg-size-bytes': 10 * 1024 * 1024, + 'server.http-listen-port': $._config.server_http_port, + // Do not extend the replication set on unhealthy (or LEAVING) ingester when "unregister on shutdown" // is set to false. 'distributor.extend-writes': $._config.unregister_ingesters_on_shutdown, diff --git a/operations/mimir/store-gateway.libsonnet b/operations/mimir/store-gateway.libsonnet index 200d861a3c0..fa0b9979381 100644 --- a/operations/mimir/store-gateway.libsonnet +++ b/operations/mimir/store-gateway.libsonnet @@ -20,6 +20,9 @@ $._config.queryBlocksStorageConfig + { target: 'store-gateway', + + 'server.http-listen-port': $._config.server_http_port, + 'runtime-config.file': '%s/overrides.yaml' % $._config.overrides_configmap_mountpoint, // Persist ring tokens so that when the store-gateway will be restarted diff --git a/pkg/mimir/mimir.go b/pkg/mimir/mimir.go index 92c897eff2a..284ee701048 100644 --- a/pkg/mimir/mimir.go +++ b/pkg/mimir/mimir.go @@ -255,6 +255,9 @@ func (c *Config) registerServerFlagsWithChangedDefaultValues(fs *flag.FlagSet) { case "server.grpc.keepalive.ping-without-stream-allowed": _ = f.Value.Set("true") + + case "server.http-listen-port": + _ = f.Value.Set("8080") } fs.Var(f.Value, f.Name, f.Usage) diff --git a/tools/migrate-ingester-statefulsets.sh b/tools/migrate-ingester-statefulsets.sh index 8f4cc443203..26055a0f005 100644 --- a/tools/migrate-ingester-statefulsets.sh +++ b/tools/migrate-ingester-statefulsets.sh @@ -43,7 +43,7 @@ while [[ $INSTANCES_TO_DOWNSCALE -gt 0 ]]; do # wget (BusyBox version) will fail, but we don't care ... important thing is that it has triggered shutdown. # -T causes wget to wait only 5 seconds, otherwise /shutdown takes a long time. # Preferably we would wait for /shutdown to return, but unfortunately that doesn't work (even with big timeout), wget complains with weird error. - kubectl exec "$POD_TO_SHUTDOWN" --namespace="$NAMESPACE" -- wget -T 5 http://localhost:80/shutdown >/dev/null 2>/dev/null || true + kubectl exec "$POD_TO_SHUTDOWN" --namespace="$NAMESPACE" -- wget -T 5 http://localhost:8080/shutdown >/dev/null 2>/dev/null || true # While request to /shutdown completes only after flushing has finished, it unfortunately returns 204 status code, # which confuses wget. That is the reason why instead of waiting for /shutdown to complete, this script waits for