Last active
December 7, 2018 15:21
-
-
Save lukmdo/c9237956615accefce960078bb15dc2e to your computer and use it in GitHub Desktop.
unify_labels_v2 prom chart diffs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| default, prometheus-kube-state-metrics, NetworkPolicy (networking.k8s.io) has changed: | |
| # Source: prometheus/templates/kube-state-metrics-networkpolicy.yaml | |
| apiVersion: networking.k8s.io/v1 | |
| kind: NetworkPolicy | |
| metadata: | |
| name: prometheus-kube-state-metrics | |
| labels: | |
| component: "kube-state-metrics" | |
| app: prometheus | |
| release: prometheus | |
| chart: prometheus-8.1.0 | |
| heritage: Tiller | |
| spec: | |
| podSelector: | |
| matchLabels: | |
| - app: prometheus | |
| component: "kube-state-metrics" | |
| + app: prometheus | |
| release: prometheus | |
| ingress: | |
| - from: | |
| - podSelector: | |
| matchLabels: | |
| - release: prometheus | |
| component: "server" | |
| + app: prometheus | |
| + release: prometheus | |
| - ports: | |
| - port: 8080 | |
| default, prometheus-server-headless, Service (v1) has changed: | |
| # Source: prometheus/templates/server-service-headless.yaml | |
| apiVersion: v1 | |
| kind: Service | |
| metadata: | |
| labels: | |
| + component: "server" | |
| app: prometheus | |
| + release: prometheus | |
| chart: prometheus-8.1.0 | |
| - component: "server" | |
| heritage: Tiller | |
| - release: prometheus | |
| name: prometheus-server-headless | |
| spec: | |
| clusterIP: None | |
| ports: | |
| - name: http | |
| port: 80 | |
| protocol: TCP | |
| targetPort: 9090 | |
| selector: | |
| - app: prometheus | |
| component: "server" | |
| + app: prometheus | |
| release: prometheus | |
| default, prometheus-server, NetworkPolicy (networking.k8s.io) has changed: | |
| # Source: prometheus/templates/server-networkpolicy.yaml | |
| apiVersion: networking.k8s.io/v1 | |
| kind: NetworkPolicy | |
| metadata: | |
| name: prometheus-server | |
| labels: | |
| component: "server" | |
| app: prometheus | |
| release: prometheus | |
| chart: prometheus-8.1.0 | |
| heritage: Tiller | |
| spec: | |
| podSelector: | |
| matchLabels: | |
| - app: prometheus | |
| component: "server" | |
| + app: prometheus | |
| release: prometheus | |
| ingress: | |
| - ports: | |
| - port: 9090 | |
| default, prometheus-alertmanager-headless, Service (v1) has changed: | |
| # Source: prometheus/templates/alertmanager-service-headless.yaml | |
| apiVersion: v1 | |
| kind: Service | |
| metadata: | |
| labels: | |
| + component: "alertmanager" | |
| app: prometheus | |
| + release: prometheus | |
| chart: prometheus-8.1.0 | |
| - component: "alertmanager" | |
| heritage: Tiller | |
| - release: prometheus | |
| name: prometheus-alertmanager-headless | |
| spec: | |
| clusterIP: None | |
| ports: | |
| - name: http | |
| port: 80 | |
| protocol: TCP | |
| targetPort: 9093 | |
| selector: | |
| - app: prometheus | |
| component: "alertmanager" | |
| + app: prometheus | |
| release: prometheus | |
| default, prometheus-alertmanager, StatefulSet (apps) has changed: | |
| # Source: prometheus/templates/alertmanager-statefulset.yaml | |
| apiVersion: apps/v1 | |
| kind: StatefulSet | |
| metadata: | |
| labels: | |
| + component: "alertmanager" | |
| app: prometheus | |
| + release: prometheus | |
| chart: prometheus-8.1.0 | |
| - component: "alertmanager" | |
| heritage: Tiller | |
| - release: prometheus | |
| name: prometheus-alertmanager | |
| spec: | |
| serviceName: prometheus-alertmanager-headless | |
| selector: | |
| matchLabels: | |
| - app: prometheus | |
| component: "alertmanager" | |
| + app: prometheus | |
| release: prometheus | |
| replicas: 1 | |
| podManagementPolicy: OrderedReady | |
| template: | |
| metadata: | |
| labels: | |
| - app: prometheus | |
| component: "alertmanager" | |
| + app: prometheus | |
| release: prometheus | |
| + chart: prometheus-8.1.0 | |
| + heritage: Tiller | |
| spec: | |
| serviceAccountName: prometheus-alertmanager | |
| containers: | |
| - name: prometheus-alertmanager | |
| image: "prom/alertmanager:v0.15.3" | |
| imagePullPolicy: "IfNotPresent" | |
| env: | |
| - name: POD_IP | |
| valueFrom: | |
| fieldRef: | |
| apiVersion: v1 | |
| fieldPath: status.podIP | |
| args: | |
| - --config.file=/etc/config/alertmanager.yml | |
| - --storage.path=/data | |
| - --cluster.advertise-address=$(POD_IP):6783 | |
| - --web.external-url=/ | |
| ports: | |
| - containerPort: 9093 | |
| readinessProbe: | |
| httpGet: | |
| path: /#/status | |
| port: 9093 | |
| initialDelaySeconds: 30 | |
| timeoutSeconds: 30 | |
| resources: | |
| {} | |
| volumeMounts: | |
| - name: config-volume | |
| mountPath: /etc/config | |
| - name: storage-volume | |
| mountPath: "/data" | |
| subPath: "" | |
| - name: prometheus-alertmanager-configmap-reload | |
| image: "jimmidyson/configmap-reload:v0.2.2" | |
| imagePullPolicy: "IfNotPresent" | |
| args: | |
| - --volume-dir=/etc/config | |
| - --webhook-url=http://localhost:9093/-/reload | |
| resources: | |
| {} | |
| volumeMounts: | |
| - name: config-volume | |
| mountPath: /etc/config | |
| readOnly: true | |
| volumes: | |
| - name: config-volume | |
| configMap: | |
| name: prometheus-alertmanager | |
| volumeClaimTemplates: | |
| - metadata: | |
| name: storage-volume | |
| spec: | |
| accessModes: | |
| - ReadWriteOnce | |
| resources: | |
| requests: | |
| storage: "2Gi" | |
| default, prometheus-server, StatefulSet (apps) has changed: | |
| # Source: prometheus/templates/server-statefulset.yaml | |
| apiVersion: apps/v1 | |
| kind: StatefulSet | |
| metadata: | |
| labels: | |
| + component: "server" | |
| app: prometheus | |
| + release: prometheus | |
| chart: prometheus-8.1.0 | |
| - component: "server" | |
| heritage: Tiller | |
| - release: prometheus | |
| name: prometheus-server | |
| spec: | |
| serviceName: prometheus-server-headless | |
| selector: | |
| matchLabels: | |
| - app: prometheus | |
| component: "server" | |
| + app: prometheus | |
| release: prometheus | |
| replicas: 1 | |
| podManagementPolicy: OrderedReady | |
| template: | |
| metadata: | |
| labels: | |
| - app: prometheus | |
| component: "server" | |
| + app: prometheus | |
| release: prometheus | |
| + chart: prometheus-8.1.0 | |
| + heritage: Tiller | |
| spec: | |
| serviceAccountName: prometheus-server | |
| initContainers: | |
| - name: "init-chown-data" | |
| image: "busybox:latest" | |
| imagePullPolicy: "IfNotPresent" | |
| resources: | |
| {} | |
| # 65534 is the nobody user that prometheus uses. | |
| command: ["chown", "-R", "65534:65534", "/data"] | |
| volumeMounts: | |
| - name: storage-volume | |
| mountPath: /data | |
| subPath: "" | |
| containers: | |
| - name: prometheus-server-configmap-reload | |
| image: "jimmidyson/configmap-reload:v0.2.2" | |
| imagePullPolicy: "IfNotPresent" | |
| args: | |
| - --volume-dir=/etc/config | |
| - --webhook-url=http://127.0.0.1:9090/-/reload | |
| resources: | |
| {} | |
| volumeMounts: | |
| - name: config-volume | |
| mountPath: /etc/config | |
| readOnly: true | |
| - name: prometheus-server | |
| image: "prom/prometheus:v2.5.0" | |
| imagePullPolicy: "IfNotPresent" | |
| args: | |
| - --config.file=/etc/config/prometheus.yml | |
| - --storage.tsdb.path=/data | |
| - --web.console.libraries=/etc/prometheus/console_libraries | |
| - --web.console.templates=/etc/prometheus/consoles | |
| - --web.enable-lifecycle | |
| ports: | |
| - containerPort: 9090 | |
| readinessProbe: | |
| httpGet: | |
| path: /-/ready | |
| port: 9090 | |
| initialDelaySeconds: 30 | |
| timeoutSeconds: 30 | |
| livenessProbe: | |
| httpGet: | |
| path: /-/healthy | |
| port: 9090 | |
| initialDelaySeconds: 30 | |
| timeoutSeconds: 30 | |
| resources: | |
| {} | |
| volumeMounts: | |
| - name: config-volume | |
| mountPath: /etc/config | |
| - name: storage-volume | |
| mountPath: /data | |
| subPath: "" | |
| terminationGracePeriodSeconds: 300 | |
| volumes: | |
| - name: config-volume | |
| configMap: | |
| name: prometheus-server | |
| volumeClaimTemplates: | |
| - metadata: | |
| name: storage-volume | |
| spec: | |
| accessModes: | |
| - ReadWriteOnce | |
| resources: | |
| requests: | |
| storage: "8Gi" | |
| default, prometheus-alertmanager, NetworkPolicy (networking.k8s.io) has changed: | |
| # Source: prometheus/templates/alertmanager-networkpolicy.yaml | |
| apiVersion: networking.k8s.io/v1 | |
| kind: NetworkPolicy | |
| metadata: | |
| name: prometheus-alertmanager | |
| labels: | |
| component: "alertmanager" | |
| app: prometheus | |
| release: prometheus | |
| chart: prometheus-8.1.0 | |
| heritage: Tiller | |
| spec: | |
| podSelector: | |
| matchLabels: | |
| - app: prometheus | |
| component: "alertmanager" | |
| + app: prometheus | |
| release: prometheus | |
| ingress: | |
| - from: | |
| - podSelector: | |
| matchLabels: | |
| - release: prometheus | |
| component: "server" | |
| + app: prometheus | |
| + release: prometheus | |
| - ports: | |
| - port: 9093 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- master.txt 2018-12-07 14:59:03.000000000 +0000 | |
| +++ unify_labels_v2.txt 2018-12-07 14:59:46.000000000 +0000 | |
| @@ -454,11 +454,11 @@ | |
| kind: Service | |
| metadata: | |
| labels: | |
| + component: "alertmanager" | |
| app: prometheus | |
| + release: RELEASE-NAME | |
| chart: prometheus-8.1.0 | |
| - component: "alertmanager" | |
| heritage: Tiller | |
| - release: RELEASE-NAME | |
| name: RELEASE-NAME-prometheus-alertmanager-headless | |
| spec: | |
| clusterIP: None | |
| @@ -468,8 +468,8 @@ | |
| protocol: TCP | |
| targetPort: 9093 | |
| selector: | |
| - app: prometheus | |
| component: "alertmanager" | |
| + app: prometheus | |
| release: RELEASE-NAME | |
| --- | |
| @@ -584,11 +584,11 @@ | |
| kind: Service | |
| metadata: | |
| labels: | |
| + component: "server" | |
| app: prometheus | |
| + release: RELEASE-NAME | |
| chart: prometheus-8.1.0 | |
| - component: "server" | |
| heritage: Tiller | |
| - release: RELEASE-NAME | |
| name: RELEASE-NAME-prometheus-server-headless | |
| spec: | |
| clusterIP: None | |
| @@ -598,8 +598,8 @@ | |
| protocol: TCP | |
| targetPort: 9090 | |
| selector: | |
| - app: prometheus | |
| component: "server" | |
| + app: prometheus | |
| release: RELEASE-NAME | |
| --- | |
| # Source: prometheus/templates/server-service.yaml | |
| @@ -778,27 +778,29 @@ | |
| kind: StatefulSet | |
| metadata: | |
| labels: | |
| + component: "alertmanager" | |
| app: prometheus | |
| + release: RELEASE-NAME | |
| chart: prometheus-8.1.0 | |
| - component: "alertmanager" | |
| heritage: Tiller | |
| - release: RELEASE-NAME | |
| name: RELEASE-NAME-prometheus-alertmanager | |
| spec: | |
| serviceName: RELEASE-NAME-prometheus-alertmanager-headless | |
| selector: | |
| matchLabels: | |
| - app: prometheus | |
| component: "alertmanager" | |
| + app: prometheus | |
| release: RELEASE-NAME | |
| replicas: 1 | |
| podManagementPolicy: OrderedReady | |
| template: | |
| metadata: | |
| labels: | |
| - app: prometheus | |
| component: "alertmanager" | |
| + app: prometheus | |
| release: RELEASE-NAME | |
| + chart: prometheus-8.1.0 | |
| + heritage: Tiller | |
| spec: | |
| serviceAccountName: RELEASE-NAME-prometheus-alertmanager | |
| containers: | |
| @@ -868,27 +870,29 @@ | |
| kind: StatefulSet | |
| metadata: | |
| labels: | |
| + component: "server" | |
| app: prometheus | |
| + release: RELEASE-NAME | |
| chart: prometheus-8.1.0 | |
| - component: "server" | |
| heritage: Tiller | |
| - release: RELEASE-NAME | |
| name: RELEASE-NAME-prometheus-server | |
| spec: | |
| serviceName: RELEASE-NAME-prometheus-server-headless | |
| selector: | |
| matchLabels: | |
| - app: prometheus | |
| component: "server" | |
| + app: prometheus | |
| release: RELEASE-NAME | |
| replicas: 1 | |
| podManagementPolicy: OrderedReady | |
| template: | |
| metadata: | |
| labels: | |
| - app: prometheus | |
| component: "server" | |
| + app: prometheus | |
| release: RELEASE-NAME | |
| + chart: prometheus-8.1.0 | |
| + heritage: Tiller | |
| spec: | |
| serviceAccountName: RELEASE-NAME-prometheus-server | |
| initContainers: | |
| @@ -981,15 +985,16 @@ | |
| spec: | |
| podSelector: | |
| matchLabels: | |
| - app: prometheus | |
| component: "alertmanager" | |
| + app: prometheus | |
| release: RELEASE-NAME | |
| ingress: | |
| - from: | |
| - podSelector: | |
| matchLabels: | |
| - release: RELEASE-NAME | |
| component: "server" | |
| + app: prometheus | |
| + release: RELEASE-NAME | |
| - ports: | |
| - port: 9093 | |
| --- | |
| @@ -1007,15 +1012,16 @@ | |
| spec: | |
| podSelector: | |
| matchLabels: | |
| - app: prometheus | |
| component: "kube-state-metrics" | |
| + app: prometheus | |
| release: RELEASE-NAME | |
| ingress: | |
| - from: | |
| - podSelector: | |
| matchLabels: | |
| - release: RELEASE-NAME | |
| component: "server" | |
| + app: prometheus | |
| + release: RELEASE-NAME | |
| - ports: | |
| - port: 8080 | |
| --- | |
| @@ -1034,8 +1040,8 @@ | |
| spec: | |
| podSelector: | |
| matchLabels: | |
| - app: prometheus | |
| component: "server" | |
| + app: prometheus | |
| release: RELEASE-NAME | |
| ingress: | |
| - ports: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment