Merge branch 'prometheus-operator-kube-prometheus' into metrics-kafka-minion

Author: solsson

prometheus/kustomization.yaml

@@ -1,6 +1,7 @@
 bases:
-- ../kafka
-# or any variant with kafka included, such as
+# This kustomization needs to depend on one with kafka in it, to add the sidecar,
+# but it needs to be the kafka from the chosen variant, as ../kafka here would override other kustomizations
+#- ../kafka
 #- ../variants/scale-1
 resources:
 - 10-metrics-config.yml

variants/prometheus-operator-baseexample/kustomization.yaml

@@ -0,0 +1,4 @@
+# Used from ../prometheus-operator as alternative to installing only the operator and its CRDs
+# because we need a stack on which to test monitoring addons
+bases:
+- github.com/coreos/kube-prometheus?ref=3a64636

variants/prometheus-operator/additional-scrape-configs.yaml

@@ -0,0 +1,12 @@
+
+apiVersion: monitoring.coreos.com/v1
+kind: Prometheus
+metadata:
+  name: k8s
+  namespace: monitoring
+spec:
+  additionalScrapeConfigs:
+    # github.com/kubernetes-sigs/kustomize/blob/master/examples/kvSourceGoPlugin.md is clearly WIP
+    name: additional-scrape-configs-5m4c7m6mc9
+    # See https://github.com/prometheus/prometheus/pull/4131, and upon disagreement see https://github.com/prometheus/prometheus/issues/4484
+    key: pods-discovery-by-prometheus-io-annotations.yaml

variants/prometheus-operator/alertmanager-main-scale-1.yaml

@@ -0,0 +1,7 @@
+apiVersion: monitoring.coreos.com/v1
+kind: Alertmanager
+metadata:
+  name: main
+  namespace: monitoring
+spec:
+  replicas: 1

variants/prometheus-operator/kustomization.yaml

@@ -1,9 +1,31 @@
 bases:
-- ../../prometheus
+# The ../../prometheus base must be edited to point to the chosen kafka base
+#- ../../prometheus
 - ../../consumers-prometheus
+# Resources won't apply without a prior apply -k with for example one of:
+#- github.com/coreos/prometheus-operator?ref=de9a6e1
+#- ../prometheus-operator-baseexample
+# TEMP:
+- ../../../unhelm/kube-prometheus
 resources:
 - k8s-kafka-rbac.yaml
 # with base ../../prometheus
 - k8s-kafka-servicemonitor.yaml
 # with base ../../consumers-prometheus
 - k8s-minion-servicemonitor.yaml
+patchesStrategicMerge:
+- prometheus-k8s-scale-1.yaml
+- prometheus-k8s-2.9.2.yaml
+- alertmanager-main-scale-1.yaml
+- prometheus-k8s-nodeport.yaml
+- additional-scrape-configs.yaml
+secretGenerator:
+- name: additional-scrape-configs
+  namespace: monitoring
+  #kvSources:
+  #- name: pods-discovery-by-prometheus-io-annotations.yaml
+    #pluginType: builtin
+    #args:
+    #- scrape-configs/pods-discovery-by-prometheus-io-annotations.yaml
+  files:
+  - scrape-configs/pods-discovery-by-prometheus-io-annotations.yaml

variants/prometheus-operator/prometheus-k8s-2.9.2.yaml

@@ -0,0 +1,8 @@
+apiVersion: monitoring.coreos.com/v1
+kind: Prometheus
+metadata:
+  name: k8s
+  namespace: monitoring
+spec:
+  baseImage: quay.io/prometheus/prometheus
+  version: v2.7.2

variants/prometheus-operator/prometheus-k8s-nodeport.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: prometheus-k8s
+  namespace: monitoring
+spec:
+  type: NodePort
+  ports:
+  - port: 9090
+    nodePort: 32490

variants/prometheus-operator/prometheus-k8s-scale-1.yaml

@@ -0,0 +1,7 @@
+apiVersion: monitoring.coreos.com/v1
+kind: Prometheus
+metadata:
+  name: k8s
+  namespace: monitoring
+spec:
+  replicas: 1

variants/prometheus-operator/scrape-configs/pods-discovery-by-prometheus-io-annotations.yaml

@@ -0,0 +1,35 @@
+# Example scrape config for pods
+#
+# The relabeling allows the actual pod scrape endpoint to be configured via the
+# following annotations:
+#
+# * `prometheus.io/scrape`: Only scrape pods that have a value of `true`
+# * `prometheus.io/path`: If the metrics path is not `/metrics` override this.
+# * `prometheus.io/port`: Scrape the pod on the indicated port instead of the
+# pod's declared ports (default is a port-free target if none are declared).
+- job_name: 'kubernetes-pods'
+
+  kubernetes_sd_configs:
+  - role: pod
+
+  relabel_configs:
+  - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
+    action: keep
+    regex: true
+  - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
+    action: replace
+    target_label: __metrics_path__
+    regex: (.+)
+  - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
+    action: replace
+    regex: ([^:]+)(?::\d+)?;(\d+)
+    replacement: $1:$2
+    target_label: __address__
+  - action: labelmap
+    regex: __meta_kubernetes_pod_label_(.+)
+  - source_labels: [__meta_kubernetes_namespace]
+    action: replace
+    target_label: kubernetes_namespace
+  - source_labels: [__meta_kubernetes_pod_name]
+    action: replace
+    target_label: kubernetes_pod_name