Use server_http_port to set -server.http-listen-port flag

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
grafana · Jan 26, 2022 · fa71733 · fa71733
1 parent 6d38af3
commit fa71733
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 0 deletions.
diff --git a/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml b/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml
@@ -760,6 +760,7 @@ 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
@@ -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
@@ -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
@@ -996,6 +999,7 @@ 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
@@ -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=
@@ -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
@@ -1252,6 +1258,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=compactor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1352,6 +1359,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
         - -target=ingester
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -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=

diff --git a/operations/mimir-tests/test-query-sharding-generated.yaml b/operations/mimir-tests/test-query-sharding-generated.yaml
@@ -759,6 +759,7 @@ 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
@@ -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
@@ -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
@@ -999,6 +1002,7 @@ 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
@@ -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=
@@ -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
@@ -1255,6 +1261,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=compactor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1355,6 +1362,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
         - -target=ingester
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -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=

diff --git a/operations/mimir-tests/test-storage-azure-generated.yaml b/operations/mimir-tests/test-storage-azure-generated.yaml
@@ -759,6 +759,7 @@ 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
@@ -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
@@ -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
@@ -997,6 +1000,7 @@ 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
@@ -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=
@@ -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
@@ -1261,6 +1267,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=compactor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1363,6 +1370,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
         - -target=ingester
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -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=

diff --git a/operations/mimir-tests/test-storage-gcs-generated.yaml b/operations/mimir-tests/test-storage-gcs-generated.yaml
@@ -759,6 +759,7 @@ 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
@@ -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
@@ -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
@@ -995,6 +998,7 @@ 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
@@ -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=
@@ -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
@@ -1251,6 +1257,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=compactor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1351,6 +1358,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
         - -target=ingester
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -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=

diff --git a/operations/mimir-tests/test-storage-s3-generated.yaml b/operations/mimir-tests/test-storage-s3-generated.yaml
@@ -759,6 +759,7 @@ 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
@@ -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
@@ -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
@@ -996,6 +999,7 @@ 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
@@ -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=
@@ -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
@@ -1257,6 +1263,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=compactor
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -1358,6 +1365,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
         - -target=ingester
         image: cortexproject/cortex:v1.9.0
         imagePullPolicy: IfNotPresent
@@ -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=

diff --git 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/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/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
@@ -15,6 +15,8 @@
     {
       target: 'ingester',
 
+      'server.http-listen-port': $._config.server_http_port,
+
       // Ring config.
       'ingester.num-tokens': 512,
       'ingester.join-after': '0s',