diff --git a/CHANGELOG.md b/CHANGELOG.md index f11536b9..34c5c855 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## master / unreleased +* [CHANGE] Use port number for prometheus port annotations. #288 * [CHANGE] Disable ingester startup probes by default. #286 * [FEATURE] Optionally manage cortex config as configmap. #280 * [ENHANCEMENT] Upgrade to Cortex v1.11.0 #272 diff --git a/README.md b/README.md index 8689efc8..8fad2307 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ Kubernetes: `^1.19.0-0` | alertmanager.​persistentVolume.​size | string | `"2Gi"` | Alertmanager data Persistent Volume size | | alertmanager.​persistentVolume.​storageClass | string | `nil` | Alertmanager data Persistent Volume Storage Class If defined, storageClassName: If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. | | alertmanager.​persistentVolume.​subPath | string | `""` | Subdirectory of Alertmanager data Persistent Volume to mount Useful if the volume's root directory is not empty | -| alertmanager.​podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":"true"}` | Pod Annotations | +| alertmanager.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | | alertmanager.​podDisruptionBudget | object | `{"maxUnavailable":1}` | If not set then a PodDisruptionBudget will not be created | | alertmanager.​podLabels | object | `{}` | Pod Labels | | alertmanager.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -174,7 +174,7 @@ Kubernetes: `^1.19.0-0` | compactor.​persistentVolume.​size | string | `"2Gi"` | | | compactor.​persistentVolume.​storageClass | string | `nil` | compactor data Persistent Volume Storage Class If defined, storageClassName: If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. | | compactor.​persistentVolume.​subPath | string | `""` | Subdirectory of compactor data Persistent Volume to mount Useful if the volume's root directory is not empty | -| compactor.​podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":"true"}` | Pod Annotations | +| compactor.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | | compactor.​podDisruptionBudget.​maxUnavailable | int | `1` | | | compactor.​podLabels | object | `{}` | Pod Labels | | compactor.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -263,7 +263,7 @@ Kubernetes: `^1.19.0-0` | configs.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | | | configs.​nodeSelector | object | `{}` | | | configs.​persistentVolume.​subPath | string | `nil` | | -| configs.​podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":"true"}` | Pod Annotations | +| configs.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | | configs.​podDisruptionBudget.​maxUnavailable | int | `1` | | | configs.​podLabels | object | `{}` | Pod Labels | | configs.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -318,7 +318,7 @@ Kubernetes: `^1.19.0-0` | distributor.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | | | distributor.​nodeSelector | object | `{}` | | | distributor.​persistentVolume.​subPath | string | `nil` | | -| distributor.​podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":"true"}` | Pod Annotations | +| distributor.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | | distributor.​podDisruptionBudget.​maxUnavailable | int | `1` | | | distributor.​podLabels | object | `{}` | Pod Labels | | distributor.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -379,7 +379,7 @@ Kubernetes: `^1.19.0-0` | ingester.​persistentVolume.​size | string | `"2Gi"` | Ingester data Persistent Volume size | | ingester.​persistentVolume.​storageClass | string | `nil` | Ingester data Persistent Volume Storage Class If defined, storageClassName: If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. | | ingester.​persistentVolume.​subPath | string | `""` | Subdirectory of Ingester data Persistent Volume to mount Useful if the volume's root directory is not empty | -| ingester.​podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":"true"}` | Pod Annotations | +| ingester.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | | ingester.​podDisruptionBudget.​maxUnavailable | int | `1` | | | ingester.​podLabels | object | `{}` | Pod Labels | | ingester.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -490,7 +490,7 @@ Kubernetes: `^1.19.0-0` | nginx.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | | | nginx.​nodeSelector | object | `{}` | | | nginx.​persistentVolume.​subPath | string | `nil` | | -| nginx.​podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":""}` | Pod Annotations | +| nginx.​podAnnotations | object | `{}` | Pod Annotations | | nginx.​podDisruptionBudget.​maxUnavailable | int | `1` | | | nginx.​podLabels | object | `{}` | Pod Labels | | nginx.​readinessProbe.​httpGet.​path | string | `"/healthz"` | | @@ -536,7 +536,7 @@ Kubernetes: `^1.19.0-0` | querier.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | | | querier.​nodeSelector | object | `{}` | | | querier.​persistentVolume.​subPath | string | `nil` | | -| querier.​podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":"true"}` | Pod Annotations | +| querier.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | | querier.​podDisruptionBudget.​maxUnavailable | int | `1` | | | querier.​podLabels | object | `{}` | Pod Labels | | querier.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -580,7 +580,7 @@ Kubernetes: `^1.19.0-0` | query_frontend.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | | | query_frontend.​nodeSelector | object | `{}` | | | query_frontend.​persistentVolume.​subPath | string | `nil` | | -| query_frontend.​podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":"true"}` | Pod Annotations | +| query_frontend.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | | query_frontend.​podDisruptionBudget.​maxUnavailable | int | `1` | | | query_frontend.​podLabels | object | `{}` | Pod Labels | | query_frontend.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -621,7 +621,7 @@ Kubernetes: `^1.19.0-0` | ruler.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | | | ruler.​nodeSelector | object | `{}` | | | ruler.​persistentVolume.​subPath | string | `nil` | | -| ruler.​podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":"true"}` | Pod Annotations | +| ruler.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | | ruler.​podDisruptionBudget.​maxUnavailable | int | `1` | | | ruler.​podLabels | object | `{}` | Pod Labels | | ruler.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -684,7 +684,7 @@ Kubernetes: `^1.19.0-0` | store_gateway.​persistentVolume.​size | string | `"2Gi"` | Store-gateway data Persistent Volume size | | store_gateway.​persistentVolume.​storageClass | string | `nil` | Store-gateway data Persistent Volume Storage Class If defined, storageClassName: If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. | | store_gateway.​persistentVolume.​subPath | string | `""` | Subdirectory of Store-gateway data Persistent Volume to mount Useful if the volume's root directory is not empty | -| store_gateway.​podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":"true"}` | Pod Annotations | +| store_gateway.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | | store_gateway.​podDisruptionBudget.​maxUnavailable | int | `1` | | | store_gateway.​podLabels | object | `{}` | Pod Labels | | store_gateway.​readinessProbe.​httpGet.​path | string | `"/ready"` | | @@ -724,7 +724,7 @@ Kubernetes: `^1.19.0-0` | table_manager.​livenessProbe.​httpGet.​port | string | `"http-metrics"` | | | table_manager.​nodeSelector | object | `{}` | | | table_manager.​persistentVolume.​subPath | string | `nil` | | -| table_manager.​podAnnotations | object | `{"prometheus.io/port":"http-metrics","prometheus.io/scrape":"true"}` | Pod Annotations | +| table_manager.​podAnnotations | object | `{"prometheus.io/port":"8080","prometheus.io/scrape":"true"}` | Pod Annotations | | table_manager.​podDisruptionBudget.​maxUnavailable | int | `1` | | | table_manager.​podLabels | object | `{}` | Pod Labels | | table_manager.​readinessProbe.​httpGet.​path | string | `"/ready"` | | diff --git a/values.yaml b/values.yaml index 791f990a..66f07e9c 100644 --- a/values.yaml +++ b/values.yaml @@ -201,7 +201,7 @@ alertmanager: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: 'http-metrics' + prometheus.io/port: '8080' nodeSelector: {} affinity: {} @@ -345,7 +345,7 @@ distributor: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: 'http-metrics' + prometheus.io/port: '8080' nodeSelector: {} affinity: @@ -453,7 +453,7 @@ ingester: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: 'http-metrics' + prometheus.io/port: '8080' nodeSelector: {} affinity: @@ -605,7 +605,7 @@ ruler: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: 'http-metrics' + prometheus.io/port: '8080' nodeSelector: {} affinity: {} @@ -723,7 +723,7 @@ querier: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: 'http-metrics' + prometheus.io/port: '8080' nodeSelector: {} affinity: @@ -825,7 +825,7 @@ query_frontend: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: 'http-metrics' + prometheus.io/port: '8080' nodeSelector: {} affinity: @@ -915,7 +915,7 @@ table_manager: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: 'http-metrics' + prometheus.io/port: '8080' nodeSelector: {} affinity: {} @@ -994,7 +994,7 @@ configs: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: 'http-metrics' + prometheus.io/port: '8080' nodeSelector: {} affinity: {} @@ -1105,9 +1105,7 @@ nginx: podLabels: {} # -- Pod Annotations - podAnnotations: - prometheus.io/scrape: '' - prometheus.io/port: 'http-metrics' + podAnnotations: {} nodeSelector: {} affinity: {} @@ -1195,7 +1193,7 @@ store_gateway: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: 'http-metrics' + prometheus.io/port: '8080' nodeSelector: {} affinity: @@ -1313,7 +1311,7 @@ compactor: # -- Pod Annotations podAnnotations: prometheus.io/scrape: 'true' - prometheus.io/port: 'http-metrics' + prometheus.io/port: '8080' nodeSelector: {} affinity: