Fix yaml generation in build script

This solution isn't perfect, but it works.

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: carlosedp
+patreon: carlosedp

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is. Please do not use an Issue to ask for help deploying the stack in the cluster. Troubleshoot your cluster configuration first.
+
+**Troubleshooting**
+
+1. Which kind of Kubernetes cluster are you using? (Kubernetes, K3s, etc)
+2. Are all pods in "Running" state? If any is in CrashLoopback or Error, check it's logs.
+3. You cluster already works with other applications that have HTTP/HTTPS? If not, first deploy an example NGINX and test it's access thru the created URL.
+4. If you enabled persistence, do your cluster already provides persistent storage (PVs) to other applications?
+5. Does it provides dynamic storage thru StorageClass?
+6. If you deployed the monitoring stack and some targets are not available or showing no metrics in Grafana, make sure you don't have IPTables rules or use a firewall on your nodes before deploying Kubernetes.
+
+**Customizations**
+
+1. Did you customize `vars.jsonnet`? Put the contents below:
+
+```jsonnet
+# vars.jsonnet content
+```
+
+2. Did you change any other file? Put the contents below:
+
+```jsonnet
+# file x.yz content
+```
+
+**What did you see when trying to access Grafana and Prometheus web GUI**
+A clear and concise description with screenshots from the URLs and logs from the pods.
+
+**Additional context**
+Add any other context about the problem here.

.gitignore

@@ -2,3 +2,4 @@ vendor
 auth
 server.crt
 server.key
+.idea

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "jsonnet.libPaths": [
+        "vendor/",
+    ],
+}

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Carlos Eduardo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -5,6 +5,13 @@ JB_BINARY := $(GOPATH)/bin/jb
 
 JSONNET_FMT := $(GOPATH)/bin/jsonnetfmt -n 2 --max-blank-lines 2 --string-style s --comment-style s
 
+GO_MAJOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
+GO_MINOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
+MINIMUM_SUPPORTED_GO_MAJOR_VERSION = 1
+MINIMUM_SUPPORTED_GO_MINOR_VERSION = 18
+GO_VERSION_VALIDATION_ERR_MSG = Your golang version, $(GO_MAJOR_VERSION).$(GO_MINOR_VERSION), is not supported, \
+								please update to at least $(MINIMUM_SUPPORTED_GO_MAJOR_VERSION).$(MINIMUM_SUPPORTED_GO_MINOR_VERSION).
+
 .PHONY: generate vendor fmt manifests help
 
 all: manifests       ## Builds the  manifests
@@ -18,52 +25,63 @@ manifests: $(JSONNET_BIN)       ## Builds the  manifests
 	rm -rf manifests
 	./scripts/build.sh main.jsonnet $(JSONNET_BIN)
 
-update_libs: $(JB_BINARY)       ## Updates vendor libs. Require a regeneration of the manifests
+docker:        ## Builds the manifests in a Docker container to avoid installing pre-requisites (Golang, Jsonnet, etc)
+	docker run -it --rm -v $(PWD):/work -w /work --rm golang bash -c "make vendor && make"
+
+update_libs: $(JB_BINARY)        ## Updates vendor libs. Require a regeneration of the manifests
 	$(JB_BINARY) update
 
-vendor: $(JB_BINARY) jsonnetfile.json jsonnetfile.lock.json       ## Download vendor libs
+vendor: validate-go-version $(JB_BINARY) jsonnetfile.json jsonnetfile.lock.json       ## Download vendor libs
 	rm -rf vendor
 	$(JB_BINARY) install
 
-fmt:       ## Formats all jsonnet and libsonnet files (except on vendor dir)
+fmt:        ## Formats all jsonnet and libsonnet files (except on vendor dir)
 	@echo "Formatting jsonnet files"
-	@find . -name 'vendor' -prune -o -name '*.libsonnet' -o -name '*.jsonnet' -print | xargs -n 1 -- $(JSONNET_FMT) -i
+	@find . -type f \( -iname "*.libsonnet" -or -iname "*.jsonnet" \) -print -or -name "vendor" -prune | xargs -n 1 -- $(JSONNET_FMT) -i
 
-deploy: manifests       ## Rebuilds manifests and deploy to configured cluster
+deploy:        ## Deploy current manifests to configured cluster
 	echo "Deploying stack setup manifests..."
 	kubectl apply -f ./manifests/setup/
 	echo "Will wait 10 seconds to deploy the additional manifests.."
 	sleep 10
 	kubectl apply -f ./manifests/
 
-teardown:       ## Delete all monitoring stack resources from configured cluster
+teardown:        ## Delete all monitoring stack resources from configured cluster
 	kubectl delete -f ./manifests/
 	kubectl delete -f ./manifests/setup/
 
-tar: manifests       ## Generates a .tar.gz from manifests dir
+tar: manifests        ## Generates a .tar.gz from manifests dir
 	rm -rf manifests.tar.gz
 	tar -cfz manifests.tar.gz manifests
 
-$(JB_BINARY):       ## Installs jsonnet-bundler utility
+$(JB_BINARY):        ## Installs jsonnet-bundler utility
 	@echo "Installing jsonnet-bundler"
-	@go get -u github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb
+	@go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest
 
-$(JSONNET_BIN):       ## Installs jsonnet and jsonnetfmt utility
+$(JSONNET_BIN):        ## Installs jsonnet and jsonnetfmt utility
 	@echo "Installing jsonnet"
-	@go get -u github.com/google/go-jsonnet/cmd/jsonnet
-	@go get -u github.com/google/go-jsonnet/cmd/jsonnetfmt
-	@go get -u github.com/brancz/gojsontoyaml
+	@go install github.com/google/go-jsonnet/cmd/jsonnet@latest
+	@go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
+	@go install github.com/brancz/gojsontoyaml@latest
 
-update_tools:       ## Updates jsonnet, jsonnetfmt and jb utilities
+update_tools:        ## Updates jsonnet, jsonnetfmt and jb utilities
 	@echo "Updating jsonnet"
-	@go get -u github.com/google/go-jsonnet/cmd/jsonnet
-	@go get -u github.com/google/go-jsonnet/cmd/jsonnetfmt
-	@go get -u github.com/brancz/gojsontoyaml
-	@go get -u github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb
+	@go install github.com/google/go-jsonnet/cmd/jsonnet@latest
+	@go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
+	@go install github.com/brancz/gojsontoyaml@latest
+	@go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest
 
-change_suffix:       ## Changes suffix for the ingress
-	@perl -p -i -e 's/^(\s*)\-\ host:.*/\1- host: alertmanager.${IP}.nip.io/g' manifests/ingress-alertmanager.yaml manifests/ingress-prometheus.yaml manifests/ingress-grafana.yaml
-	@echo "Ingress IPs changed to [service].${IP}.nip.io"
-	${K3S} kubectl apply -f manifests/ingress-alertmanager.yaml
-	${K3S} kubectl apply -f manifests/ingress-grafana.yaml
-	${K3S} kubectl apply -f manifests/ingress-prometheus.yaml
+change_suffix:        ## Changes suffix for the ingress. Pass suffix=[suffixURL] as argument
+	@echo "Ingress IPs changed to [service].${suffix}"
+	@echo "Apply to your cluster with:"
+	@for f in alertmanager prometheus grafana; do \
+		cat manifests/ingress-$$f.yaml | sed -e "s/\(.*$$f\.\).*/\1${suffix}/" > manifests/ingress-$$f.yaml-tmp; \
+		mv -f manifests/ingress-$$f.yaml-tmp manifests/ingress-$$f.yaml; \
+		echo ${K3S} kubectl apply -f manifests/ingress-$$f.yaml; \
+	done
+
+validate-go-version:  ## Validates the installed version of go to allow the `go install` syntax needed for `make vendor`
+	@if [ $(GO_MAJOR_VERSION) -lt $(MINIMUM_SUPPORTED_GO_MAJOR_VERSION) -o $(GO_MINOR_VERSION) -lt $(MINIMUM_SUPPORTED_GO_MINOR_VERSION) ]; then \
+    	echo '$(GO_VERSION_VALIDATION_ERR_MSG)'; \
+    	exit 1; \
+	fi

Readme.md

@@ -4,7 +4,7 @@ The Prometheus Operator for Kubernetes provides easy monitoring definitions for
 
 This have been tested on a hybrid ARM64 / X84-64 Kubernetes cluster deployed as [this article](https://medium.com/@carlosedp/building-a-hybrid-x86-64-and-arm-kubernetes-cluster-e7f94ff6e51d).
 
-This repository collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
+This repository collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. The container images support AMD64, ARM64, ARM and PPC64le architectures.
 
 The content of this project is written in jsonnet and is an extension of the fantastic [kube-prometheus](https://github.com/coreos/prometheus-operator/blob/master/contrib/kube-prometheus) project.
 
@@ -25,7 +25,7 @@ There are additional modules (disabled by default) to monitor other components o
 
 The additional modules are:
 
-* arm-exporter to generate temperature metrics (works on some ARM boards like RaspberryPi)
+* ARM-exporter to generate temperature metrics (works on some ARM boards like RaspberryPi)
 * MetalLB metrics
 * Traefik metrics
 * ElasticSearch metrics
@@ -36,22 +36,36 @@ There are also options to set the ingress domain suffix and enable persistence f
 
 The ingresses can use TLS with the default self-signed certificate from your Ingress controller by setting `TLSingress` to `true` and use a custom certificate by creating the files `server.crt` and `server.key` and enabling the `UseProvidedCerts` parameter at `vars.jsonnet`.
 
-After changing these parameters, rebuild the manifests with `make`.
+Persistence for Prometheus and Grafana can be enabled in the `enablePersistence` section. Setting each to `true`, creates the volume PVCs. If no PV names are defined in `prometheusPV` and `grafanaPV`, the default StorageClass will be used to dynamically create the PVs The sizes can be adjusted in `prometheusSizePV` and `grafanaSizePV`.
+
+If using pre-created persistent volumes (samples in [`samples`](samples)), check permissions on the directories hosting the files. The `UID:GID` for Prometheus is `1000:0` and for Grafana is `472:472`.
+
+Changing these parameters require a rebuild of the manifests with `make` followed by `make deploy`. To avoid installing all pre-requisites like Golang, Jsonnet, Jsonnet-bundler, use the target `make docker` to build in a container.
 
 ## Quickstart (non K3s)
 
-The repository already provides a set of compiled manifests to be applied into the cluster. The deployment can be customized thru the jsonnet files.
+The repository already provides a set of compiled manifests to be applied into the cluster or the deployment can be customized thru the jsonnet files.
 
-For the ingresses, edit `suffixDomain` to have your cluster URL suffix. This will be your ingresses will be exposed (ex. grafana.yourcluster.domain.com).
+If you only need the default features and adjust your cluster URL for the ingress, there is no need to rebuild the manifests(and install all tools). Use the `change_suffix` target with  argument `suffix=[suffixURL]` with the URL of your cluster ingress controller. If you have a local cluster, use the nip.io domain resolver passing `your_cluster_ip.nip.io` to the `suffix` argument. After this, just run `make deploy`.
 
-To deploy the stack, run:
+```bash
+# Update the ingress URLs
+make change_suffix suffix=[suffixURL]
+
+# Deploy
+make deploy
+```
+
+To customize the manifests, edit `vars.jsonnet` and rebuild the manifests.
 
 ```bash
 $ make vendor
+$ make
 $ make deploy
 
 # Or manually:
 
+$ make vendor
 $ make
 $ kubectl apply -f manifests/setup/
 $ kubectl apply -f manifests/
@@ -63,9 +77,7 @@ If you enable the SMTP relay for Gmail in `vars.jsonnet`, the pod will be in an
 
 ## Quickstart on Minikube
 
-You can also test and develop the monitoring stack on Minikube. First install minikube by following the instructions [here](https://kubernetes.io/docs/tasks/tools/install-minikube/) for your platform.
-
-Then, adjust and deploy the stack:
+You can also test and develop the monitoring stack on Minikube. First install minikube by following the instructions [here](https://kubernetes.io/docs/tasks/tools/install-minikube/) for your platform. Then, follow the instructions similar to the non-K3s deployment:
 
 ```bash
 # Start minikube (if not started)
@@ -77,9 +89,14 @@ minikube addons enable ingress
 # Get the minikube instance IP
 minikube ip
 
-# Adjust the "suffixDomain" line in `vars.jsonnet` to the IP of the minikube instance keeping the "nip.io"
-# Build and deploy the monitoring stack
+# Run the change_suffix target
+make change_suffix suffix=[minikubeIP.nip.io]
+
+# or customize additional params on vars.jsonnet and rebuild
 make vendor
+make
+
+# and deploy the manifests
 make deploy
 
 # Get the URLs for the exposed applications and open in your browser
@@ -99,6 +116,7 @@ After changing these values to deploy the stack, run:
 
 ```bash
 $ make vendor
+$ make
 $ make deploy
 
 # Or manually:
@@ -125,7 +143,7 @@ To list the created ingresses, run `kubectl get ingress --all-namespaces`, if yo
 
 ## Updating the ingress suffixes
 
-To avoid rebuilding all manifests, there is a make target to update the Ingress URL suffix to a different suffix (using nip.io) to match your host IP. Run `make change_suffix IP="[IP-ADDRESS]"` to change the ingress route IP for Grafana, Prometheus and Alertmanager and reapply the manifests. If you have a K3s cluster, run `make change_suffix IP="[IP-ADDRESS] K3S=k3s`.
+To avoid rebuilding all manifests, there is a make target to update the Ingress URL suffix to a different suffix. Run `make change_suffix suffix="[clusterURL]"` to change the ingress route IP for Grafana, Prometheus and Alertmanager and reapply the manifests.
 
 ## Customizing
 
@@ -133,7 +151,7 @@ The content of this project consists of a set of jsonnet files making up a libra
 
 ### Pre-reqs
 
-The project requires json-bundler and the jsonnet compiler. The Makefile does the heavy-lifting of installing them. You need [Go](https://golang.org/dl/) already installed:
+The project requires json-bundler and the jsonnet compiler. The Makefile does the heavy-lifting of installing them. You need [Go](https://golang.org/dl/) (version 1.18 minimum) already installed:
 
 ```bash
 git clone https://github.com/carlosedp/cluster-monitoring

base_operator_stack.jsonnet

@@ -4,12 +4,13 @@ local vars = import 'vars.jsonnet';
 
 {
   _config+:: {
-    namespace: 'monitoring',
+    namespace: vars._config.namespace,
 
     urls+:: {
-      prom_ingress: 'prometheus.' + vars.suffixDomain,
-      alert_ingress: 'alertmanager.' + vars.suffixDomain,
-      grafana_ingress: 'grafana.' + vars.suffixDomain,
+      domains: [vars.suffixDomain] + vars.additionalDomains,
+      prom_ingress: ['prometheus.' + domain for domain in $._config.urls.domains],
+      alert_ingress: ['alertmanager.' + domain for domain in $._config.urls.domains],
+      grafana_ingress: ['grafana.' + domain for domain in $._config.urls.domains],
       grafana_ingress_external: 'grafana.' + vars.suffixDomain,
     },
 
@@ -58,6 +59,8 @@ local vars = import 'vars.jsonnet';
           },
         },
       },
+      plugins: vars.grafana.plugins,
+      env: vars.grafana.env
     },
   },
   //---------------------------------------
@@ -69,18 +72,21 @@ local vars = import 'vars.jsonnet';
     local pvc = k.core.v1.persistentVolumeClaim,
     prometheus+: {
       spec+: {
+               // Here one can use parameters from https://coreos.com/operators/prometheus/docs/latest/api.html#prometheusspec
                replicas: $._config.prometheus.replicas,
-               retention: '15d',
-               externalUrl: 'http://' + $._config.urls.prom_ingress,
+               retention: vars.prometheus.retention,
+               scrapeInterval: vars.prometheus.scrapeInterval,
+               scrapeTimeout: vars.prometheus.scrapeTimeout,
+               externalUrl: 'http://' + $._config.urls.prom_ingress[0],
              }
              + (if vars.enablePersistence.prometheus then {
                   storage: {
                     volumeClaimTemplate:
                       pvc.new() +
                       pvc.mixin.spec.withAccessModes('ReadWriteOnce') +
-                      pvc.mixin.spec.resources.withRequests({ storage: '20Gi' }),
-                    // Uncomment below to define a StorageClass name
-                    //+ pvc.mixin.spec.withStorageClassName('nfs-master-ssd'),
+                      pvc.mixin.spec.resources.withRequests({ storage: vars.enablePersistence.prometheusSizePV }) +
+                      (if vars.enablePersistence.prometheusPV != null then pvc.mixin.spec.withVolumeName(vars.enablePersistence.prometheusPV)) +
+                      (if vars.enablePersistence.storageClass != null then pvc.mixin.spec.withStorageClassName(vars.enablePersistence.storageClass)),
                   },
                 } else {}),
     },
@@ -120,7 +126,10 @@ local vars = import 'vars.jsonnet';
       pvc.mixin.metadata.withNamespace($._config.namespace) +
       pvc.mixin.metadata.withName('grafana-storage') +
       pvc.mixin.spec.withAccessModes('ReadWriteOnce') +
-      pvc.mixin.spec.resources.withRequests({ storage: '2Gi' }),
+      pvc.mixin.spec.resources.withRequests({ storage: vars.enablePersistence.grafanaSizePV }) +
+      (if vars.enablePersistence.grafanaPV != null then pvc.mixin.spec.withVolumeName(vars.enablePersistence.grafanaPV)) +
+      (if vars.enablePersistence.storageClass != null then pvc.mixin.spec.withStorageClassName(vars.enablePersistence.storageClass)),
+
   } else {},
 
   grafanaDashboards+:: $._config.grafanaDashboards,
@@ -131,9 +140,9 @@ local vars = import 'vars.jsonnet';
       local I = utils.newIngress('alertmanager-main', $._config.namespace, $._config.urls.alert_ingress, '/', 'alertmanager-main', 'web');
       if vars.TLSingress then
         if vars.UseProvidedCerts then
-          utils.addIngressTLS(I, 'ingress-TLS-secret')
+          utils.addIngressTLS(I, $._config.urls.alert_ingress, 'ingress-secret')
         else
-          utils.addIngressTLS(I)
+          utils.addIngressTLS(I, $._config.urls.alert_ingress)
       else
         I,
 
@@ -141,9 +150,9 @@ local vars = import 'vars.jsonnet';
       local I = utils.newIngress('grafana', $._config.namespace, $._config.urls.grafana_ingress, '/', 'grafana', 'http');
       if vars.TLSingress then
         if vars.UseProvidedCerts then
-          utils.addIngressTLS(I, 'ingress-TLS-secret')
+          utils.addIngressTLS(I, $._config.urls.grafana_ingress, 'ingress-secret')
         else
-          utils.addIngressTLS(I)
+          utils.addIngressTLS(I, $._config.urls.grafana_ingress)
       else
         I,
 
@@ -151,9 +160,9 @@ local vars = import 'vars.jsonnet';
       local I = utils.newIngress('prometheus-k8s', $._config.namespace, $._config.urls.prom_ingress, '/', 'prometheus-k8s', 'web');
       if vars.TLSingress then
         if vars.UseProvidedCerts then
-          utils.addIngressTLS(I, 'ingress-TLS-secret')
+          utils.addIngressTLS(I, $._config.urls.prom_ingress, 'ingress-secret')
         else
-          utils.addIngressTLS(I)
+          utils.addIngressTLS(I, $._config.urls.prom_ingress)
       else
         I,
 
@@ -183,6 +192,6 @@ local vars = import 'vars.jsonnet';
     //     secret.mixin.metadata.withNamespace($._config.namespace),
   } + if vars.UseProvidedCerts then {
     secret:
-      utils.newTLSSecret('ingress-TLS-secret', $._config.namespace, vars.TLSCertificate, vars.TLSKey),
+      utils.newTLSSecret('ingress-secret', $._config.namespace, vars.TLSCertificate, vars.TLSKey),
   } else {},
 }

grafana-dashboards/coredns-dashboard.json

@@ -1,16 +1,14 @@
 {
   "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
+    "list": [{
+      "builtIn": 1,
+      "datasource": "-- Grafana --",
+      "enable": true,
+      "hide": true,
+      "iconColor": "rgba(0, 211, 255, 1)",
+      "name": "Annotations & Alerts",
+      "type": "dashboard"
+    }]
   },
   "description": "A dashboard for the CoreDNS DNS server.",
   "editable": true,
@@ -19,8 +17,7 @@
   "id": 14,
   "iteration": 1549319226130,
   "links": [],
-  "panels": [
-    {
+  "panels": [{
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
@@ -54,17 +51,14 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "total",
-          "yaxis": 2
-        }
-      ],
+      "seriesOverrides": [{
+        "alias": "total",
+        "yaxis": 2
+      }],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
-      "targets": [
-        {
+      "targets": [{
           "expr": "sum(rate(coredns_dns_request_count_total{instance=~\"$instance\"}[5m])) by (proto)",
           "format": "time_series",
           "intervalFactor": 2,
@@ -99,8 +93,7 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
+      "yaxes": [{
           "format": "pps",
           "logBase": 1,
           "max": null,
@@ -154,8 +147,7 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [
-        {
+      "seriesOverrides": [{
           "alias": "total",
           "yaxis": 2
         },
@@ -167,15 +159,13 @@
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum(rate(coredns_dns_request_type_count_total{instance=~\"$instance\"}[5m])) by (type)",
-          "intervalFactor": 2,
-          "legendFormat": "{{type}}",
-          "refId": "A",
-          "step": 60
-        }
-      ],
+      "targets": [{
+        "expr": "sum(rate(coredns_dns_request_type_count_total{instance=~\"$instance\"}[5m])) by (type)",
+        "intervalFactor": 2,
+        "legendFormat": "{{type}}",
+        "refId": "A",
+        "step": 60
+      }],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
@@ -194,8 +184,7 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
+      "yaxes": [{
           "format": "pps",
           "logBase": 1,
           "max": null,
@@ -249,17 +238,14 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "total",
-          "yaxis": 2
-        }
-      ],
+      "seriesOverrides": [{
+        "alias": "total",
+        "yaxis": 2
+      }],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
-      "targets": [
-        {
+      "targets": [{
           "expr": "sum(rate(coredns_dns_request_count_total{instance=~\"$instance\"}[5m])) by (zone)",
           "intervalFactor": 2,
           "legendFormat": "{{zone}}",
@@ -292,8 +278,7 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
+      "yaxes": [{
           "format": "pps",
           "logBase": 1,
           "max": null,
@@ -347,17 +332,14 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "total",
-          "yaxis": 2
-        }
-      ],
+      "seriesOverrides": [{
+        "alias": "total",
+        "yaxis": 2
+      }],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
-      "targets": [
-        {
+      "targets": [{
           "expr": "sum(rate(coredns_dns_request_do_count_total{instance=~\"$instance\"}[5m]))",
           "intervalFactor": 2,
           "legendFormat": "DO",
@@ -390,8 +372,7 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
+      "yaxes": [{
           "format": "pps",
           "logBase": 1,
           "max": null,
@@ -445,8 +426,7 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [
-        {
+      "seriesOverrides": [{
           "alias": "tcp:90",
           "yaxis": 2
         },
@@ -462,8 +442,7 @@
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
-      "targets": [
-        {
+      "targets": [{
           "expr": "histogram_quantile(0.99, sum(rate(coredns_dns_request_size_bytes_bucket{instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto))",
           "intervalFactor": 2,
           "legendFormat": "{{proto}}:99 ",
@@ -503,8 +482,7 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
+      "yaxes": [{
           "format": "bytes",
           "logBase": 1,
           "max": null,
@@ -558,8 +536,7 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [
-        {
+      "seriesOverrides": [{
           "alias": "tcp:90",
           "yaxis": 1
         },
@@ -575,8 +552,7 @@
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
-      "targets": [
-        {
+      "targets": [{
           "expr": "histogram_quantile(0.99, sum(rate(coredns_dns_request_size_bytes_bucket{instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto))",
           "intervalFactor": 2,
           "legendFormat": "{{proto}}:99 ",
@@ -616,8 +592,7 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
+      "yaxes": [{
           "format": "bytes",
           "logBase": 1,
           "max": null,
@@ -675,15 +650,13 @@
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum(rate(coredns_dns_response_rcode_count_total{instance=~\"$instance\"}[5m])) by (rcode)",
-          "intervalFactor": 2,
-          "legendFormat": "{{rcode}}",
-          "refId": "A",
-          "step": 40
-        }
-      ],
+      "targets": [{
+        "expr": "sum(rate(coredns_dns_response_rcode_count_total{instance=~\"$instance\"}[5m])) by (rcode)",
+        "intervalFactor": 2,
+        "legendFormat": "{{rcode}}",
+        "refId": "A",
+        "step": 40
+      }],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
@@ -702,8 +675,7 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
+      "yaxes": [{
           "format": "pps",
           "logBase": 1,
           "max": null,
@@ -761,8 +733,7 @@
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
-      "targets": [
-        {
+      "targets": [{
           "expr": "histogram_quantile(0.99, sum(rate(coredns_dns_request_duration_milliseconds_bucket{instance=~\"$instance\"}[5m])) by (le, job))",
           "intervalFactor": 2,
           "legendFormat": "99%",
@@ -802,8 +773,7 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
+      "yaxes": [{
           "format": "ms",
           "logBase": 1,
           "max": null,
@@ -857,8 +827,7 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [
-        {
+      "seriesOverrides": [{
           "alias": "udp:50%",
           "yaxis": 1
         },
@@ -878,8 +847,7 @@
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
-      "targets": [
-        {
+      "targets": [{
           "expr": "histogram_quantile(0.99, sum(rate(coredns_dns_response_size_bytes_bucket{instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto)) ",
           "intervalFactor": 2,
           "legendFormat": "{{proto}}:99%",
@@ -920,8 +888,7 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
+      "yaxes": [{
           "format": "bytes",
           "logBase": 1,
           "max": null,
@@ -975,8 +942,7 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [
-        {
+      "seriesOverrides": [{
           "alias": "udp:50%",
           "yaxis": 1
         },
@@ -996,8 +962,7 @@
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
-      "targets": [
-        {
+      "targets": [{
           "expr": "histogram_quantile(0.99, sum(rate(coredns_dns_response_size_bytes_bucket{instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto)) ",
           "intervalFactor": 2,
           "legendFormat": "{{proto}}:99%",
@@ -1038,8 +1003,7 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
+      "yaxes": [{
           "format": "bytes",
           "logBase": 1,
           "max": null,
@@ -1097,15 +1061,13 @@
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum(coredns_cache_size{instance=~\"$instance\"}) by (type)",
-          "intervalFactor": 2,
-          "legendFormat": "{{type}}",
-          "refId": "A",
-          "step": 40
-        }
-      ],
+      "targets": [{
+        "expr": "sum(coredns_cache_size{instance=~\"$instance\"}) by (type)",
+        "intervalFactor": 2,
+        "legendFormat": "{{type}}",
+        "refId": "A",
+        "step": 40
+      }],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
@@ -1124,8 +1086,7 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
+      "yaxes": [{
           "format": "short",
           "logBase": 1,
           "max": null,
@@ -1179,17 +1140,14 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "misses",
-          "yaxis": 2
-        }
-      ],
+      "seriesOverrides": [{
+        "alias": "misses",
+        "yaxis": 2
+      }],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
-      "targets": [
-        {
+      "targets": [{
           "expr": "sum(rate(coredns_cache_hits_total{instance=~\"$instance\"}[5m])) by (type)",
           "intervalFactor": 2,
           "legendFormat": "hits:{{type}}",
@@ -1222,8 +1180,7 @@
         "show": true,
         "values": []
       },
-      "yaxes": [
-        {
+      "yaxes": [{
           "format": "pps",
           "logBase": 1,
           "max": null,
@@ -1251,33 +1208,31 @@
     "coredns"
   ],
   "templating": {
-    "list": [
-      {
-        "allValue": ".*",
-        "current": {
-          "text": "All",
-          "value": "$__all"
-        },
-        "datasource": "prometheus",
-        "definition": "",
-        "hide": 0,
-        "includeAll": true,
-        "label": "Instance",
-        "multi": false,
-        "name": "instance",
-        "options": [],
-        "query": "up{job=\"coredns\"}",
-        "refresh": 1,
-        "regex": ".*instance=\"(.*?)\".*",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      }
-    ]
+    "list": [{
+      "allValue": ".*",
+      "current": {
+        "text": "All",
+        "value": "$__all"
+      },
+      "datasource": "prometheus",
+      "definition": "",
+      "hide": 0,
+      "includeAll": true,
+      "label": "Instance",
+      "multi": false,
+      "name": "instance",
+      "options": [],
+      "query": "up{job=\"coredns\"}",
+      "refresh": 1,
+      "regex": ".*instance=\"(.*?)\".*",
+      "skipUrlSync": false,
+      "sort": 0,
+      "tagValuesQuery": "",
+      "tags": [],
+      "tagsQuery": "",
+      "type": "query",
+      "useTags": false
+    }]
   },
   "time": {
     "from": "now-3h",
@@ -1311,6 +1266,5 @@
   },
   "timezone": "utc",
   "title": "CoreDNS",
-  "uid": "q-QViRumz",
   "version": 1
-}
+}

grafana-dashboards/elasticsearch-dashboard.json

@@ -2252,6 +2252,5 @@
     },
     "timezone": "utc",
     "title": "ElasticSearch Cluster",
-    "uid": "n_nxrE_mk7",
     "version": 4
-  }
+  }

grafana-dashboards/speedtest-exporter-dashboard.json

@@ -0,0 +1,352 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "links": [],
+  "panels": [
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 10,
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 0,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 4,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "connected",
+      "options": {
+        "alertThreshold": true,
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pluginVersion": "7.0.3",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": true,
+      "targets": [
+        {
+          "expr": "speedtest_ping_latency_milliseconds",
+          "format": "time_series",
+          "instant": false,
+          "interval": "",
+          "legendFormat": "Ping (ms)",
+          "refId": "A"
+        },
+        {
+          "expr": "speedtest_jitter_latency_milliseconds",
+          "format": "time_series",
+          "instant": false,
+          "interval": "",
+          "legendFormat": "Jitter (ms)",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Ping and Jitter (ms)",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:291",
+          "format": "ms",
+          "label": "Time",
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:292",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "prometheus",
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 10,
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 8,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "connected",
+      "options": {
+        "alertThreshold": true,
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pluginVersion": "7.2.1",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": true,
+      "targets": [
+        {
+          "expr": "speedtest_download_bits_per_second*10^-6",
+          "format": "time_series",
+          "instant": false,
+          "interval": "",
+          "legendFormat": "Download Speed (Mbits/s)",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Download Speed (Mbits/s)",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:291",
+          "format": "Mbits",
+          "label": "Download Speed",
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:292",
+          "decimals": null,
+          "format": "dateTimeAsLocal",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "prometheus",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 10,
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 16,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 3,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "connected",
+      "options": {
+        "alertThreshold": true,
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pluginVersion": "7.2.1",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": true,
+      "targets": [
+        {
+          "expr": "speedtest_upload_bits_per_second*10^-6",
+          "format": "time_series",
+          "interval": "",
+          "legendFormat": "Upload Speed (Mbits/s)",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Upload Speed (Mbits/s)",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:291",
+          "decimals": null,
+          "format": "Mbits",
+          "label": "Upload Speed",
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:292",
+          "decimals": null,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "refresh": "15m",
+  "schemaVersion": 25,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Speedtest Dashboard",
+  "uid": "-fs18ztMz",
+  "version": 1
+}

image_sources_versions.jsonnet

@@ -1,19 +1,19 @@
 {
   _config+:: {
     versions+:: {
-      prometheus: 'v2.16.0',
-      alertmanager: 'v0.20.0',
-      kubeStateMetrics: '1.9.5',
+      prometheus: 'v2.19.1',
+      alertmanager: 'v0.21.0',
+      kubeStateMetrics: '1.9.6',
       kubeRbacProxy: 'v0.5.0',
       addonResizer: '2.3',
       nodeExporter: 'v0.18.1',
-      prometheusOperator: 'v0.37.0',
-      prometheusAdapter: 'v0.6.0',
-      grafana: '6.6.2',
+      prometheusOperator: 'v0.40.0',
+      prometheusAdapter: 'v0.7.0',
+      grafana: '7.0.3',
       configmapReloader: 'latest',
-      prometheusConfigReloader: 'v0.37.0',
+      prometheusConfigReloader: 'v0.40.0',
       armExporter: 'latest',
-      smtpServer: 'v1.0.1',
+      smtpRelay: 'v1.0.1',
       elasticExporter: '1.0.4rc1',
     },
 
@@ -25,12 +25,12 @@
       addonResizer: 'carlosedp/addon-resizer',
       nodeExporter: 'prom/node-exporter',
       prometheusOperator: 'carlosedp/prometheus-operator',
-      prometheusAdapter: 'carlosedp/k8s-prometheus-adapter',
+      prometheusAdapter: 'directxman12/k8s-prometheus-adapter',
       grafana: 'grafana/grafana',
       configmapReloader: 'carlosedp/configmap-reload',
       prometheusConfigReloader: 'carlosedp/prometheus-config-reloader',
       armExporter: 'carlosedp/arm_exporter',
-      smtpServer: 'carlosedp/docker-smtp',
+      smtpRelay: 'carlosedp/docker-smtp',
       elasticExporter: 'carlosedp/elasticsearch-exporter',
     },
   },

jsonnetfile.lock.json

@@ -18,8 +18,8 @@
           "subdir": "Documentation/etcd-mixin"
         }
       },
-      "version": "07a74d61cb6c07965c5b594748dc999d1644862b",
-      "sum": "Ko3qhNfC2vN/houLh6C0Ryacjv70gl0DVPGU/PQ4OD0="
+      "version": "d8c8f903eee10b8391abaef7758c38b2cd393c55",
+      "sum": "pk7mLpdUrHuJKkj2vhD6LGMU7P+oYYooBXAeZyZa398="
     },
     {
       "source": {
@@ -28,8 +28,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "285624d8fbef01923f7b9772fe2da21c5698a666",
-      "sum": "npFy3VLHkSDiwUK2DPC9Up4ETD0bMiTpGTXqetH0r4A="
+      "version": "17989b42aa10b1c6afa07043cb05bcd5ae492284",
+      "sum": "2FR289B1LGUf5tTN4PXBj5TjRX7okSFxE8uHkSslzDQ="
     },
     {
       "source": {
@@ -38,8 +38,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "59bdf55453ba08b4ed7c271cb3c6627058945ed5",
-      "sum": "qwMbUQkdPhAn9Sl4OVLgzmNOuOTnRLUmvv14I0unsa8="
+      "version": "e31c69f9b5c6555e0f4a5c1f39d0f03182dd6b41",
+      "sum": "WggWVWZ+CBEUThQCztSaRELbtqdXf9s3OFzf06HbYNA="
     },
     {
       "source": {
@@ -48,8 +48,8 @@
           "subdir": "grafonnet"
         }
       },
-      "version": "7a932c9cfc6ccdb1efca9535f165e055949be42a",
-      "sum": "HbCbHRvgA9a6K5FlOAYOUnErDHnNPWOCYPvDFU++bQE="
+      "version": "8fb95bd89990e493a8534205ee636bfcb8db67bd",
+      "sum": "tDuuSKE9f4Ew2bjBM33Rs6behLEAzkmKkShSt+jpAak="
     },
     {
       "source": {
@@ -58,7 +58,7 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "03da9ea0fc25e621d195fbb218a6bf8593152721",
+      "version": "881db2241f0c5007c3e831caf34b0c645202b4ab",
       "sum": "slxrtftVDiTlQK22ertdfrg4Epnq97gdrLI63ftUfaE="
     },
     {
@@ -79,8 +79,8 @@
           "subdir": ""
         }
       },
-      "version": "ea905d25c01ff4364937a2faed248e5f2f3fdb35",
-      "sum": "ww9kAgxtpzRC6y7SiVWH7fWJcptBg3Hde50eXmHzN7U="
+      "version": "b61c5a34051f8f57284a08fe78ad8a45b430252b",
+      "sum": "7Hx/5eNm7ubLTsdrpk3b2+e/FLR3XOa4HCukmbRUCAY="
     },
     {
       "source": {
@@ -89,7 +89,7 @@
           "subdir": "lib/promgrafonnet"
         }
       },
-      "version": "ea905d25c01ff4364937a2faed248e5f2f3fdb35",
+      "version": "b61c5a34051f8f57284a08fe78ad8a45b430252b",
       "sum": "VhgBM39yv0f4bKv8VfGg4FXkg573evGDRalip9ypKbc="
     },
     {
@@ -99,7 +99,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "c485728b2e585bd1079e12e462cd7c6fef25f155",
+      "version": "d667979ed55ad1c4db44d331b51d646f5b903aa7",
       "sum": "cJjGZaLBjcIGrLHZLjRPU9c3KL+ep9rZTb9dbALSKqA="
     },
     {
@@ -109,18 +109,8 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "c485728b2e585bd1079e12e462cd7c6fef25f155",
-      "sum": "E1GGavnf9PCWBm4WVrxWnc0FIj72UcbcweqGioWrOdU="
-    },
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/metalmatze/slo-libsonnet.git",
-          "subdir": "slo-libsonnet"
-        }
-      },
-      "version": "5ddd7ffc39e7a54c9aca997c2c389a8046fab0ff",
-      "sum": "S7/+tnAkzVh8Li7sg7Hu4aeIQAWHCtxhRQ+k1OKjoQk="
+      "version": "d667979ed55ad1c4db44d331b51d646f5b903aa7",
+      "sum": "o5avaguRsfFwYFNen00ZEsub1x4i8Z/ZZ2QoEjFMff8="
     },
     {
       "source": {
@@ -129,8 +119,8 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "0107bc794204f50d887898da60032da890637471",
-      "sum": "VKdF0zPMSCiuIuXWblSz2VOeBaXzQ7fp40vz9sxj+Bo="
+      "version": "08ce3c6dd430deb51798826701a395e460620d60",
+      "sum": "3jFV2qsc/GZe2GADswTYqxxP2zGOiANTj73W/VNFGqc="
     },
     {
       "source": {
@@ -139,8 +129,8 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "012161d90d6a8a6bb930b90601fb89ff6cc3ae60",
-      "sum": "5EUgr6Spr1zNR8Y2/NevjvEkGV9WMvKo6nEScNER1Lc=",
+      "version": "74207c04655e1fd93eea0e9a5d2f31b1cbc4d3d0",
+      "sum": "lEzhZ8gllSfAO4kmXeTwl4W0anapIeFd5GCaCNuDe18=",
       "name": "prometheus"
     }
   ],

manifests/alertmanager-alertmanager.yaml

@@ -20,7 +20,7 @@ spec:
           - monitoring
           topologyKey: kubernetes.io/hostname
         weight: 100
-  image: prom/alertmanager:v0.20.0
+  image: prom/alertmanager:v0.21.0
   nodeSelector:
     kubernetes.io/os: linux
   replicas: 1
@@ -29,4 +29,4 @@ spec:
     runAsNonRoot: true
     runAsUser: 1000
   serviceAccountName: alertmanager-main
-  version: v0.20.0
+  version: v0.21.0

manifests/grafana-deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - env: []
-        image: grafana/grafana:6.6.2
+        image: grafana/grafana:7.0.3
         name: grafana
         ports:
         - containerPort: 3000

manifests/ingress-alertmanager.yaml

@@ -1,17 +1,20 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: alertmanager-main
   namespace: monitoring
 spec:
   rules:
-  - host: alertmanager.192.168.15.15.nip.io
+  - host: alertmanager.192.168.1.15.nip.io
     http:
       paths:
       - backend:
-          serviceName: alertmanager-main
-          servicePort: web
+          service:
+            name: alertmanager-main
+            port:
+              name: web
         path: /
+        pathType: Prefix
   tls:
   - hosts:
-    - alertmanager.192.168.15.15.nip.io
+    - alertmanager.192.168.1.15.nip.io

manifests/ingress-grafana.yaml

@@ -1,17 +1,20 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: grafana
   namespace: monitoring
 spec:
   rules:
-  - host: grafana.192.168.15.15.nip.io
+  - host: grafana.192.168.1.15.nip.io
     http:
       paths:
       - backend:
-          serviceName: grafana
-          servicePort: http
+          service:
+            name: grafana
+            port:
+              name: http
         path: /
+        pathType: Prefix
   tls:
   - hosts:
-    - grafana.192.168.15.15.nip.io
+    - grafana.192.168.1.15.nip.io

manifests/ingress-prometheus.yaml

@@ -1,17 +1,20 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: prometheus-k8s
   namespace: monitoring
 spec:
   rules:
-  - host: prometheus.192.168.15.15.nip.io
+  - host: prometheus.192.168.1.15.nip.io
     http:
       paths:
       - backend:
-          serviceName: prometheus-k8s
-          servicePort: web
+          service:
+            name: prometheus-k8s
+            port:
+              name: web
         path: /
+        pathType: Prefix
   tls:
   - hosts:
-    - prometheus.192.168.15.15.nip.io
+    - prometheus.192.168.1.15.nip.io

manifests/kube-state-metrics-clusterRole.yaml

@@ -3,7 +3,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.5
+    app.kubernetes.io/version: 1.9.6
   name: kube-state-metrics
 rules:
 - apiGroups:

manifests/kube-state-metrics-clusterRoleBinding.yaml

@@ -3,7 +3,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.5
+    app.kubernetes.io/version: 1.9.6
   name: kube-state-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io

manifests/kube-state-metrics-deployment.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.5
+    app.kubernetes.io/version: 1.9.6
   name: kube-state-metrics
   namespace: monitoring
 spec:
@@ -15,7 +15,7 @@ spec:
     metadata:
       labels:
         app.kubernetes.io/name: kube-state-metrics
-        app.kubernetes.io/version: 1.9.5
+        app.kubernetes.io/version: 1.9.6
     spec:
       containers:
       - args:
@@ -23,7 +23,7 @@ spec:
         - --port=8081
         - --telemetry-host=127.0.0.1
         - --telemetry-port=8082
-        image: carlosedp/kube-state-metrics:v1.9.5
+        image: carlosedp/kube-state-metrics:v1.9.6
         name: kube-state-metrics
         securityContext:
           runAsUser: 65534

manifests/kube-state-metrics-service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.5
+    app.kubernetes.io/version: 1.9.6
   name: kube-state-metrics
   namespace: monitoring
 spec:

manifests/kube-state-metrics-serviceAccount.yaml

@@ -3,6 +3,6 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.5
+    app.kubernetes.io/version: 1.9.6
   name: kube-state-metrics
   namespace: monitoring

manifests/kube-state-metrics-serviceMonitor.yaml

@@ -3,7 +3,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.5
+    app.kubernetes.io/version: 1.9.6
   name: kube-state-metrics
   namespace: monitoring
 spec:

manifests/node-exporter-daemonset.yaml

@@ -2,17 +2,19 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   labels:
-    app: node-exporter
+    app.kubernetes.io/name: node-exporter
+    app.kubernetes.io/version: v0.18.1
   name: node-exporter
   namespace: monitoring
 spec:
   selector:
     matchLabels:
-      app: node-exporter
+      app.kubernetes.io/name: node-exporter
   template:
     metadata:
       labels:
-        app: node-exporter
+        app.kubernetes.io/name: node-exporter
+        app.kubernetes.io/version: v0.18.1
     spec:
       containers:
       - args:
@@ -22,8 +24,7 @@ spec:
         - --path.rootfs=/host/root
         - --no-collector.wifi
         - --no-collector.hwmon
-        - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+)($|/)
-        - --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$
+        - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)
         image: prom/node-exporter:v0.18.1
         name: node-exporter
         resources:

manifests/node-exporter-service.yaml

@@ -2,7 +2,8 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    k8s-app: node-exporter
+    app.kubernetes.io/name: node-exporter
+    app.kubernetes.io/version: v0.18.1
   name: node-exporter
   namespace: monitoring
 spec:
@@ -12,4 +13,4 @@ spec:
     port: 9100
     targetPort: https
   selector:
-    app: node-exporter
+    app.kubernetes.io/name: node-exporter

manifests/node-exporter-serviceMonitor.yaml

@@ -2,7 +2,8 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    k8s-app: node-exporter
+    app.kubernetes.io/name: node-exporter
+    app.kubernetes.io/version: v0.18.1
   name: node-exporter
   namespace: monitoring
 spec:
@@ -20,7 +21,7 @@ spec:
     scheme: https
     tlsConfig:
       insecureSkipVerify: true
-  jobLabel: k8s-app
+  jobLabel: app.kubernetes.io/name
   selector:
     matchLabels:
-      k8s-app: node-exporter
+      app.kubernetes.io/name: node-exporter

manifests/prometheus-adapter-configMap.yaml

@@ -1,32 +1,32 @@
 apiVersion: v1
 data:
-  config.yaml: |
-    resourceRules:
-      cpu:
-        containerQuery: sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[5m])) by (<<.GroupBy>>)
-        nodeQuery: sum(1 - irate(node_cpu_seconds_total{mode="idle"}[5m]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)
-        resources:
-          overrides:
-            node:
-              resource: node
-            namespace:
-              resource: namespace
-            pod:
-              resource: pod
-        containerLabel: container
-      memory:
-        containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}) by (<<.GroupBy>>)
-        nodeQuery: sum(node_memory_MemTotal_bytes{job="node-exporter",<<.LabelMatchers>>} - node_memory_MemAvailable_bytes{job="node-exporter",<<.LabelMatchers>>}) by (<<.GroupBy>>)
-        resources:
-          overrides:
-            instance:
-              resource: node
-            namespace:
-              resource: namespace
-            pod:
-              resource: pod
-        containerLabel: container
-      window: 5m
+  config.yaml: |-
+    "resourceRules":
+      "cpu":
+        "containerLabel": "container"
+        "containerQuery": "sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!=\"POD\",container!=\"\",pod!=\"\"}[5m])) by (<<.GroupBy>>)"
+        "nodeQuery": "sum(1 - irate(node_cpu_seconds_total{mode=\"idle\"}[5m]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)"
+        "resources":
+          "overrides":
+            "namespace":
+              "resource": "namespace"
+            "node":
+              "resource": "node"
+            "pod":
+              "resource": "pod"
+      "memory":
+        "containerLabel": "container"
+        "containerQuery": "sum(container_memory_working_set_bytes{<<.LabelMatchers>>,container!=\"POD\",container!=\"\",pod!=\"\"}) by (<<.GroupBy>>)"
+        "nodeQuery": "sum(node_memory_MemTotal_bytes{job=\"node-exporter\",<<.LabelMatchers>>} - node_memory_MemAvailable_bytes{job=\"node-exporter\",<<.LabelMatchers>>}) by (<<.GroupBy>>)"
+        "resources":
+          "overrides":
+            "instance":
+              "resource": "node"
+            "namespace":
+              "resource": "namespace"
+            "pod":
+              "resource": "pod"
+      "window": "5m"
 kind: ConfigMap
 metadata:
   name: adapter-config

manifests/prometheus-adapter-deployment.yaml

@@ -25,7 +25,7 @@ spec:
         - --metrics-relist-interval=1m
         - --prometheus-url=http://prometheus-k8s.monitoring.svc:9090/
         - --secure-port=6443
-        image: carlosedp/k8s-prometheus-adapter:v0.6.0
+        image: directxman12/k8s-prometheus-adapter:v0.7.0
         name: prometheus-adapter
         ports:
         - containerPort: 6443

manifests/prometheus-kubeControllerManagerPrometheusDiscoveryService

@@ -1,24 +0,0 @@
-{
-   "apiVersion": "v1",
-   "kind": "Service",
-   "metadata": {
-      "labels": {
-         "k8s-app": "kube-controller-manager"
-      },
-      "name": "kube-controller-manager-prometheus-discovery",
-      "namespace": "kube-system"
-   },
-   "spec": {
-      "clusterIP": "None",
-      "ports": [
-         {
-            "name": "http-metrics",
-            "port": 10252,
-            "targetPort": 10252
-         }
-      ],
-      "selector": {
-         "component": "kube-controller-manager"
-      }
-   }
-}

manifests/prometheus-operator-serviceMonitor.yaml

@@ -4,15 +4,19 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.37.0
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
   namespace: monitoring
 spec:
   endpoints:
-  - honorLabels: true
-    port: http
+  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
+    honorLabels: true
+    port: https
+    scheme: https
+    tlsConfig:
+      insecureSkipVerify: true
   selector:
     matchLabels:
       app.kubernetes.io/component: controller
       app.kubernetes.io/name: prometheus-operator
-      app.kubernetes.io/version: v0.37.0
+      app.kubernetes.io/version: v0.40.0

manifests/prometheus-prometheus.yaml

@@ -25,8 +25,8 @@ spec:
     - name: alertmanager-main
       namespace: monitoring
       port: web
-  externalUrl: http://prometheus.192.168.15.15.nip.io
-  image: prom/prometheus:v2.16.0
+  externalUrl: http://prometheus.192.168.1.15.nip.io
+  image: prom/prometheus:v2.19.1
   nodeSelector:
     kubernetes.io/os: linux
   podMonitorNamespaceSelector: {}
@@ -40,6 +40,8 @@ spec:
     matchLabels:
       prometheus: k8s
       role: alert-rules
+  scrapeInterval: 30s
+  scrapeTimeout: 30s
   securityContext:
     fsGroup: 2000
     runAsNonRoot: true
@@ -47,4 +49,4 @@ spec:
   serviceAccountName: prometheus-k8s
   serviceMonitorNamespaceSelector: {}
   serviceMonitorSelector: {}
-  version: v2.16.0
+  version: v2.19.1

manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition

@@ -1,292 +0,0 @@
-{
-   "apiVersion": "apiextensions.k8s.io/v1beta1",
-   "kind": "CustomResourceDefinition",
-   "metadata": {
-      "annotations": {
-         "controller-gen.kubebuilder.io/version": "v0.2.4"
-      },
-      "creationTimestamp": null,
-      "name": "podmonitors.monitoring.coreos.com"
-   },
-   "spec": {
-      "group": "monitoring.coreos.com",
-      "names": {
-         "kind": "PodMonitor",
-         "listKind": "PodMonitorList",
-         "plural": "podmonitors",
-         "singular": "podmonitor"
-      },
-      "scope": "Namespaced",
-      "validation": {
-         "openAPIV3Schema": {
-            "description": "PodMonitor defines monitoring for a set of pods.",
-            "properties": {
-               "apiVersion": {
-                  "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-                  "type": "string"
-               },
-               "kind": {
-                  "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-                  "type": "string"
-               },
-               "metadata": {
-                  "type": "object"
-               },
-               "spec": {
-                  "description": "Specification of desired Pod selection for target discovery by Prometheus.",
-                  "properties": {
-                     "jobLabel": {
-                        "description": "The label to use to retrieve the job name from.",
-                        "type": "string"
-                     },
-                     "namespaceSelector": {
-                        "description": "Selector to select which namespaces the Endpoints objects are discovered from.",
-                        "properties": {
-                           "any": {
-                              "description": "Boolean describing whether all namespaces are selected in contrast to a list restricting them.",
-                              "type": "boolean"
-                           },
-                           "matchNames": {
-                              "description": "List of namespace names.",
-                              "items": {
-                                 "type": "string"
-                              },
-                              "type": "array"
-                           }
-                        },
-                        "type": "object"
-                     },
-                     "podMetricsEndpoints": {
-                        "description": "A list of endpoints allowed as part of this PodMonitor.",
-                        "items": {
-                           "description": "PodMetricsEndpoint defines a scrapeable endpoint of a Kubernetes Pod serving Prometheus metrics.",
-                           "properties": {
-                              "honorLabels": {
-                                 "description": "HonorLabels chooses the metric's labels on collisions with target labels.",
-                                 "type": "boolean"
-                              },
-                              "honorTimestamps": {
-                                 "description": "HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data.",
-                                 "type": "boolean"
-                              },
-                              "interval": {
-                                 "description": "Interval at which metrics should be scraped",
-                                 "type": "string"
-                              },
-                              "metricRelabelings": {
-                                 "description": "MetricRelabelConfigs to apply to samples before ingestion.",
-                                 "items": {
-                                    "description": "RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines `<metric_relabel_configs>`-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs",
-                                    "properties": {
-                                       "action": {
-                                          "description": "Action to perform based on regex matching. Default is 'replace'",
-                                          "type": "string"
-                                       },
-                                       "modulus": {
-                                          "description": "Modulus to take of the hash of the source label values.",
-                                          "format": "int64",
-                                          "type": "integer"
-                                       },
-                                       "regex": {
-                                          "description": "Regular expression against which the extracted value is matched. Default is '(.*)'",
-                                          "type": "string"
-                                       },
-                                       "replacement": {
-                                          "description": "Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1'",
-                                          "type": "string"
-                                       },
-                                       "separator": {
-                                          "description": "Separator placed between concatenated source label values. default is ';'.",
-                                          "type": "string"
-                                       },
-                                       "sourceLabels": {
-                                          "description": "The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions.",
-                                          "items": {
-                                             "type": "string"
-                                          },
-                                          "type": "array"
-                                       },
-                                       "targetLabel": {
-                                          "description": "Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available.",
-                                          "type": "string"
-                                       }
-                                    },
-                                    "type": "object"
-                                 },
-                                 "type": "array"
-                              },
-                              "params": {
-                                 "additionalProperties": {
-                                    "items": {
-                                       "type": "string"
-                                    },
-                                    "type": "array"
-                                 },
-                                 "description": "Optional HTTP URL parameters",
-                                 "type": "object"
-                              },
-                              "path": {
-                                 "description": "HTTP path to scrape for metrics.",
-                                 "type": "string"
-                              },
-                              "port": {
-                                 "description": "Name of the port this endpoint refers to. Mutually exclusive with targetPort.",
-                                 "type": "string"
-                              },
-                              "proxyUrl": {
-                                 "description": "ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.",
-                                 "type": "string"
-                              },
-                              "relabelings": {
-                                 "description": "RelabelConfigs to apply to samples before ingestion. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config",
-                                 "items": {
-                                    "description": "RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines `<metric_relabel_configs>`-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs",
-                                    "properties": {
-                                       "action": {
-                                          "description": "Action to perform based on regex matching. Default is 'replace'",
-                                          "type": "string"
-                                       },
-                                       "modulus": {
-                                          "description": "Modulus to take of the hash of the source label values.",
-                                          "format": "int64",
-                                          "type": "integer"
-                                       },
-                                       "regex": {
-                                          "description": "Regular expression against which the extracted value is matched. Default is '(.*)'",
-                                          "type": "string"
-                                       },
-                                       "replacement": {
-                                          "description": "Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1'",
-                                          "type": "string"
-                                       },
-                                       "separator": {
-                                          "description": "Separator placed between concatenated source label values. default is ';'.",
-                                          "type": "string"
-                                       },
-                                       "sourceLabels": {
-                                          "description": "The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions.",
-                                          "items": {
-                                             "type": "string"
-                                          },
-                                          "type": "array"
-                                       },
-                                       "targetLabel": {
-                                          "description": "Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available.",
-                                          "type": "string"
-                                       }
-                                    },
-                                    "type": "object"
-                                 },
-                                 "type": "array"
-                              },
-                              "scheme": {
-                                 "description": "HTTP scheme to use for scraping.",
-                                 "type": "string"
-                              },
-                              "scrapeTimeout": {
-                                 "description": "Timeout after which the scrape is ended",
-                                 "type": "string"
-                              },
-                              "targetPort": {
-                                 "anyOf": [
-                                    {
-                                       "type": "integer"
-                                    },
-                                    {
-                                       "type": "string"
-                                    }
-                                 ],
-                                 "description": "Name or number of the target port of the endpoint. Mutually exclusive with port.",
-                                 "x-kubernetes-int-or-string": true
-                              }
-                           },
-                           "type": "object"
-                        },
-                        "type": "array"
-                     },
-                     "podTargetLabels": {
-                        "description": "PodTargetLabels transfers labels on the Kubernetes Pod onto the target.",
-                        "items": {
-                           "type": "string"
-                        },
-                        "type": "array"
-                     },
-                     "sampleLimit": {
-                        "description": "SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.",
-                        "format": "int64",
-                        "type": "integer"
-                     },
-                     "selector": {
-                        "description": "Selector to select Pod objects.",
-                        "properties": {
-                           "matchExpressions": {
-                              "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.",
-                              "items": {
-                                 "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.",
-                                 "properties": {
-                                    "key": {
-                                       "description": "key is the label key that the selector applies to.",
-                                       "type": "string"
-                                    },
-                                    "operator": {
-                                       "description": "operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.",
-                                       "type": "string"
-                                    },
-                                    "values": {
-                                       "description": "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.",
-                                       "items": {
-                                          "type": "string"
-                                       },
-                                       "type": "array"
-                                    }
-                                 },
-                                 "required": [
-                                    "key",
-                                    "operator"
-                                 ],
-                                 "type": "object"
-                              },
-                              "type": "array"
-                           },
-                           "matchLabels": {
-                              "additionalProperties": {
-                                 "type": "string"
-                              },
-                              "description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.",
-                              "type": "object"
-                           }
-                        },
-                        "type": "object"
-                     }
-                  },
-                  "required": [
-                     "podMetricsEndpoints",
-                     "selector"
-                  ],
-                  "type": "object"
-               }
-            },
-            "required": [
-               "spec"
-            ],
-            "type": "object"
-         }
-      },
-      "version": "v1",
-      "versions": [
-         {
-            "name": "v1",
-            "served": true,
-            "storage": true
-         }
-      ]
-   },
-   "status": {
-      "acceptedNames": {
-         "kind": "",
-         "plural": ""
-      },
-      "conditions": [ ],
-      "storedVersions": [ ]
-   }
-}

manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
@@ -13,248 +13,190 @@ spec:
     plural: podmonitors
     singular: podmonitor
   scope: Namespaced
-  validation:
-    openAPIV3Schema:
-      description: PodMonitor defines monitoring for a set of pods.
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: Specification of desired Pod selection for target discovery
-            by Prometheus.
-          properties:
-            jobLabel:
-              description: The label to use to retrieve the job name from.
-              type: string
-            namespaceSelector:
-              description: Selector to select which namespaces the Endpoints objects
-                are discovered from.
-              properties:
-                any:
-                  description: Boolean describing whether all namespaces are selected
-                    in contrast to a list restricting them.
-                  type: boolean
-                matchNames:
-                  description: List of namespace names.
-                  items:
-                    type: string
-                  type: array
-              type: object
-            podMetricsEndpoints:
-              description: A list of endpoints allowed as part of this PodMonitor.
-              items:
-                description: PodMetricsEndpoint defines a scrapeable endpoint of a
-                  Kubernetes Pod serving Prometheus metrics.
-                properties:
-                  honorLabels:
-                    description: HonorLabels chooses the metric's labels on collisions
-                      with target labels.
-                    type: boolean
-                  honorTimestamps:
-                    description: HonorTimestamps controls whether Prometheus respects
-                      the timestamps present in scraped data.
-                    type: boolean
-                  interval:
-                    description: Interval at which metrics should be scraped
-                    type: string
-                  metricRelabelings:
-                    description: MetricRelabelConfigs to apply to samples before ingestion.
-                    items:
-                      description: 'RelabelConfig allows dynamic rewriting of the
-                        label set, being applied to samples before ingestion. It defines
-                        `<metric_relabel_configs>`-section of Prometheus configuration.
-                        More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
-                      properties:
-                        action:
-                          description: Action to perform based on regex matching.
-                            Default is 'replace'
-                          type: string
-                        modulus:
-                          description: Modulus to take of the hash of the source label
-                            values.
-                          format: int64
-                          type: integer
-                        regex:
-                          description: Regular expression against which the extracted
-                            value is matched. Default is '(.*)'
-                          type: string
-                        replacement:
-                          description: Replacement value against which a regex replace
-                            is performed if the regular expression matches. Regex
-                            capture groups are available. Default is '$1'
-                          type: string
-                        separator:
-                          description: Separator placed between concatenated source
-                            label values. default is ';'.
-                          type: string
-                        sourceLabels:
-                          description: The source labels select values from existing
-                            labels. Their content is concatenated using the configured
-                            separator and matched against the configured regular expression
-                            for the replace, keep, and drop actions.
-                          items:
-                            type: string
-                          type: array
-                        targetLabel:
-                          description: Label to which the resulting value is written
-                            in a replace action. It is mandatory for replace actions.
-                            Regex capture groups are available.
-                          type: string
-                      type: object
-                    type: array
-                  params:
-                    additionalProperties:
-                      items:
-                        type: string
-                      type: array
-                    description: Optional HTTP URL parameters
-                    type: object
-                  path:
-                    description: HTTP path to scrape for metrics.
-                    type: string
-                  port:
-                    description: Name of the port this endpoint refers to. Mutually
-                      exclusive with targetPort.
-                    type: string
-                  proxyUrl:
-                    description: ProxyURL eg http://proxyserver:2195 Directs scrapes
-                      to proxy through this endpoint.
-                    type: string
-                  relabelings:
-                    description: 'RelabelConfigs to apply to samples before ingestion.
-                      More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
-                    items:
-                      description: 'RelabelConfig allows dynamic rewriting of the
-                        label set, being applied to samples before ingestion. It defines
-                        `<metric_relabel_configs>`-section of Prometheus configuration.
-                        More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
-                      properties:
-                        action:
-                          description: Action to perform based on regex matching.
-                            Default is 'replace'
-                          type: string
-                        modulus:
-                          description: Modulus to take of the hash of the source label
-                            values.
-                          format: int64
-                          type: integer
-                        regex:
-                          description: Regular expression against which the extracted
-                            value is matched. Default is '(.*)'
-                          type: string
-                        replacement:
-                          description: Replacement value against which a regex replace
-                            is performed if the regular expression matches. Regex
-                            capture groups are available. Default is '$1'
-                          type: string
-                        separator:
-                          description: Separator placed between concatenated source
-                            label values. default is ';'.
-                          type: string
-                        sourceLabels:
-                          description: The source labels select values from existing
-                            labels. Their content is concatenated using the configured
-                            separator and matched against the configured regular expression
-                            for the replace, keep, and drop actions.
-                          items:
-                            type: string
-                          type: array
-                        targetLabel:
-                          description: Label to which the resulting value is written
-                            in a replace action. It is mandatory for replace actions.
-                            Regex capture groups are available.
-                          type: string
-                      type: object
-                    type: array
-                  scheme:
-                    description: HTTP scheme to use for scraping.
-                    type: string
-                  scrapeTimeout:
-                    description: Timeout after which the scrape is ended
-                    type: string
-                  targetPort:
-                    anyOf:
-                    - type: integer
-                    - type: string
-                    description: Name or number of the target port of the endpoint.
-                      Mutually exclusive with port.
-                    x-kubernetes-int-or-string: true
-                type: object
-              type: array
-            podTargetLabels:
-              description: PodTargetLabels transfers labels on the Kubernetes Pod
-                onto the target.
-              items:
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: PodMonitor defines monitoring for a set of pods.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Specification of desired Pod selection for target discovery by Prometheus.
+            properties:
+              jobLabel:
+                description: The label to use to retrieve the job name from.
                 type: string
-              type: array
-            sampleLimit:
-              description: SampleLimit defines per-scrape limit on number of scraped
-                samples that will be accepted.
-              format: int64
-              type: integer
-            selector:
-              description: Selector to select Pod objects.
-              properties:
-                matchExpressions:
-                  description: matchExpressions is a list of label selector requirements.
-                    The requirements are ANDed.
-                  items:
-                    description: A label selector requirement is a selector that contains
-                      values, a key, and an operator that relates the key and values.
-                    properties:
-                      key:
-                        description: key is the label key that the selector applies
-                          to.
-                        type: string
-                      operator:
-                        description: operator represents a key's relationship to a
-                          set of values. Valid operators are In, NotIn, Exists and
-                          DoesNotExist.
-                        type: string
-                      values:
-                        description: values is an array of string values. If the operator
-                          is In or NotIn, the values array must be non-empty. If the
-                          operator is Exists or DoesNotExist, the values array must
-                          be empty. This array is replaced during a strategic merge
-                          patch.
+              namespaceSelector:
+                description: Selector to select which namespaces the Endpoints objects are discovered from.
+                properties:
+                  any:
+                    description: Boolean describing whether all namespaces are selected in contrast to a list restricting them.
+                    type: boolean
+                  matchNames:
+                    description: List of namespace names.
+                    items:
+                      type: string
+                    type: array
+                type: object
+              podMetricsEndpoints:
+                description: A list of endpoints allowed as part of this PodMonitor.
+                items:
+                  description: PodMetricsEndpoint defines a scrapeable endpoint of a Kubernetes Pod serving Prometheus metrics.
+                  properties:
+                    honorLabels:
+                      description: HonorLabels chooses the metric's labels on collisions with target labels.
+                      type: boolean
+                    honorTimestamps:
+                      description: HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data.
+                      type: boolean
+                    interval:
+                      description: Interval at which metrics should be scraped
+                      type: string
+                    metricRelabelings:
+                      description: MetricRelabelConfigs to apply to samples before ingestion.
+                      items:
+                        description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines `<metric_relabel_configs>`-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
+                        properties:
+                          action:
+                            description: Action to perform based on regex matching. Default is 'replace'
+                            type: string
+                          modulus:
+                            description: Modulus to take of the hash of the source label values.
+                            format: int64
+                            type: integer
+                          regex:
+                            description: Regular expression against which the extracted value is matched. Default is '(.*)'
+                            type: string
+                          replacement:
+                            description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1'
+                            type: string
+                          separator:
+                            description: Separator placed between concatenated source label values. default is ';'.
+                            type: string
+                          sourceLabels:
+                            description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions.
+                            items:
+                              type: string
+                            type: array
+                          targetLabel:
+                            description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available.
+                            type: string
+                        type: object
+                      type: array
+                    params:
+                      additionalProperties:
                         items:
                           type: string
                         type: array
-                    required:
-                    - key
-                    - operator
-                    type: object
-                  type: array
-                matchLabels:
-                  additionalProperties:
-                    type: string
-                  description: matchLabels is a map of {key,value} pairs. A single
-                    {key,value} in the matchLabels map is equivalent to an element
-                    of matchExpressions, whose key field is "key", the operator is
-                    "In", and the values array contains only "value". The requirements
-                    are ANDed.
+                      description: Optional HTTP URL parameters
+                      type: object
+                    path:
+                      description: HTTP path to scrape for metrics.
+                      type: string
+                    port:
+                      description: Name of the pod port this endpoint refers to. Mutually exclusive with targetPort.
+                      type: string
+                    proxyUrl:
+                      description: ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.
+                      type: string
+                    relabelings:
+                      description: 'RelabelConfigs to apply to samples before ingestion. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
+                      items:
+                        description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines `<metric_relabel_configs>`-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
+                        properties:
+                          action:
+                            description: Action to perform based on regex matching. Default is 'replace'
+                            type: string
+                          modulus:
+                            description: Modulus to take of the hash of the source label values.
+                            format: int64
+                            type: integer
+                          regex:
+                            description: Regular expression against which the extracted value is matched. Default is '(.*)'
+                            type: string
+                          replacement:
+                            description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1'
+                            type: string
+                          separator:
+                            description: Separator placed between concatenated source label values. default is ';'.
+                            type: string
+                          sourceLabels:
+                            description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions.
+                            items:
+                              type: string
+                            type: array
+                          targetLabel:
+                            description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available.
+                            type: string
+                        type: object
+                      type: array
+                    scheme:
+                      description: HTTP scheme to use for scraping.
+                      type: string
+                    scrapeTimeout:
+                      description: Timeout after which the scrape is ended
+                      type: string
+                    targetPort:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      description: 'Deprecated: Use ''port'' instead.'
+                      x-kubernetes-int-or-string: true
                   type: object
-              type: object
-          required:
-          - podMetricsEndpoints
-          - selector
-          type: object
-      required:
-      - spec
-      type: object
-  version: v1
-  versions:
-  - name: v1
+                type: array
+              podTargetLabels:
+                description: PodTargetLabels transfers labels on the Kubernetes Pod onto the target.
+                items:
+                  type: string
+                type: array
+              sampleLimit:
+                description: SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
+                format: int64
+                type: integer
+              selector:
+                description: Selector to select Pod objects.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                    items:
+                      description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies to.
+                          type: string
+                        operator:
+                          description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+            required:
+            - podMetricsEndpoints
+            - selector
+            type: object
+        required:
+        - spec
+        type: object
     served: true
     storage: true
 status:

manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition

@@ -1,132 +0,0 @@
-{
-   "apiVersion": "apiextensions.k8s.io/v1beta1",
-   "kind": "CustomResourceDefinition",
-   "metadata": {
-      "annotations": {
-         "controller-gen.kubebuilder.io/version": "v0.2.4"
-      },
-      "creationTimestamp": null,
-      "name": "prometheusrules.monitoring.coreos.com"
-   },
-   "spec": {
-      "group": "monitoring.coreos.com",
-      "names": {
-         "kind": "PrometheusRule",
-         "listKind": "PrometheusRuleList",
-         "plural": "prometheusrules",
-         "singular": "prometheusrule"
-      },
-      "scope": "Namespaced",
-      "validation": {
-         "openAPIV3Schema": {
-            "description": "PrometheusRule defines alerting rules for a Prometheus instance",
-            "properties": {
-               "apiVersion": {
-                  "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-                  "type": "string"
-               },
-               "kind": {
-                  "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-                  "type": "string"
-               },
-               "metadata": {
-                  "type": "object"
-               },
-               "spec": {
-                  "description": "Specification of desired alerting rule definitions for Prometheus.",
-                  "properties": {
-                     "groups": {
-                        "description": "Content of Prometheus rule file",
-                        "items": {
-                           "description": "RuleGroup is a list of sequentially evaluated recording and alerting rules. Note: PartialResponseStrategy is only used by ThanosRuler and will be ignored by Prometheus instances.  Valid values for this field are 'warn' or 'abort'.  More info: https://github.com/thanos-io/thanos/blob/master/docs/components/rule.md#partial-response",
-                           "properties": {
-                              "interval": {
-                                 "type": "string"
-                              },
-                              "name": {
-                                 "type": "string"
-                              },
-                              "partial_response_strategy": {
-                                 "type": "string"
-                              },
-                              "rules": {
-                                 "items": {
-                                    "description": "Rule describes an alerting or recording rule.",
-                                    "properties": {
-                                       "alert": {
-                                          "type": "string"
-                                       },
-                                       "annotations": {
-                                          "additionalProperties": {
-                                             "type": "string"
-                                          },
-                                          "type": "object"
-                                       },
-                                       "expr": {
-                                          "anyOf": [
-                                             {
-                                                "type": "integer"
-                                             },
-                                             {
-                                                "type": "string"
-                                             }
-                                          ],
-                                          "x-kubernetes-int-or-string": true
-                                       },
-                                       "for": {
-                                          "type": "string"
-                                       },
-                                       "labels": {
-                                          "additionalProperties": {
-                                             "type": "string"
-                                          },
-                                          "type": "object"
-                                       },
-                                       "record": {
-                                          "type": "string"
-                                       }
-                                    },
-                                    "required": [
-                                       "expr"
-                                    ],
-                                    "type": "object"
-                                 },
-                                 "type": "array"
-                              }
-                           },
-                           "required": [
-                              "name",
-                              "rules"
-                           ],
-                           "type": "object"
-                        },
-                        "type": "array"
-                     }
-                  },
-                  "type": "object"
-               }
-            },
-            "required": [
-               "spec"
-            ],
-            "type": "object"
-         }
-      },
-      "version": "v1",
-      "versions": [
-         {
-            "name": "v1",
-            "served": true,
-            "storage": true
-         }
-      ]
-   },
-   "status": {
-      "acceptedNames": {
-         "kind": "",
-         "plural": ""
-      },
-      "conditions": [ ],
-      "storedVersions": [ ]
-   }
-}

manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
@@ -13,78 +13,70 @@ spec:
     plural: prometheusrules
     singular: prometheusrule
   scope: Namespaced
-  validation:
-    openAPIV3Schema:
-      description: PrometheusRule defines alerting rules for a Prometheus instance
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: Specification of desired alerting rule definitions for Prometheus.
-          properties:
-            groups:
-              description: Content of Prometheus rule file
-              items:
-                description: 'RuleGroup is a list of sequentially evaluated recording
-                  and alerting rules. Note: PartialResponseStrategy is only used by
-                  ThanosRuler and will be ignored by Prometheus instances.  Valid
-                  values for this field are ''warn'' or ''abort''.  More info: https://github.com/thanos-io/thanos/blob/master/docs/components/rule.md#partial-response'
-                properties:
-                  interval:
-                    type: string
-                  name:
-                    type: string
-                  partial_response_strategy:
-                    type: string
-                  rules:
-                    items:
-                      description: Rule describes an alerting or recording rule.
-                      properties:
-                        alert:
-                          type: string
-                        annotations:
-                          additionalProperties:
-                            type: string
-                          type: object
-                        expr:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          x-kubernetes-int-or-string: true
-                        for:
-                          type: string
-                        labels:
-                          additionalProperties:
-                            type: string
-                          type: object
-                        record:
-                          type: string
-                      required:
-                      - expr
-                      type: object
-                    type: array
-                required:
-                - name
-                - rules
-                type: object
-              type: array
-          type: object
-      required:
-      - spec
-      type: object
-  version: v1
   versions:
   - name: v1
+    schema:
+      openAPIV3Schema:
+        description: PrometheusRule defines alerting rules for a Prometheus instance
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Specification of desired alerting rule definitions for Prometheus.
+            properties:
+              groups:
+                description: Content of Prometheus rule file
+                items:
+                  description: 'RuleGroup is a list of sequentially evaluated recording and alerting rules. Note: PartialResponseStrategy is only used by ThanosRuler and will be ignored by Prometheus instances.  Valid values for this field are ''warn'' or ''abort''.  More info: https://github.com/thanos-io/thanos/blob/master/docs/components/rule.md#partial-response'
+                  properties:
+                    interval:
+                      type: string
+                    name:
+                      type: string
+                    partial_response_strategy:
+                      type: string
+                    rules:
+                      items:
+                        description: Rule describes an alerting or recording rule.
+                        properties:
+                          alert:
+                            type: string
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          expr:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            x-kubernetes-int-or-string: true
+                          for:
+                            type: string
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          record:
+                            type: string
+                        required:
+                        - expr
+                        type: object
+                      type: array
+                  required:
+                  - name
+                  - rules
+                  type: object
+                type: array
+            type: object
+        required:
+        - spec
+        type: object
     served: true
     storage: true
 status:

manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition

@@ -1,515 +0,0 @@
-{
-   "apiVersion": "apiextensions.k8s.io/v1beta1",
-   "kind": "CustomResourceDefinition",
-   "metadata": {
-      "annotations": {
-         "controller-gen.kubebuilder.io/version": "v0.2.4"
-      },
-      "creationTimestamp": null,
-      "name": "servicemonitors.monitoring.coreos.com"
-   },
-   "spec": {
-      "group": "monitoring.coreos.com",
-      "names": {
-         "kind": "ServiceMonitor",
-         "listKind": "ServiceMonitorList",
-         "plural": "servicemonitors",
-         "singular": "servicemonitor"
-      },
-      "scope": "Namespaced",
-      "validation": {
-         "openAPIV3Schema": {
-            "description": "ServiceMonitor defines monitoring for a set of services.",
-            "properties": {
-               "apiVersion": {
-                  "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-                  "type": "string"
-               },
-               "kind": {
-                  "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-                  "type": "string"
-               },
-               "metadata": {
-                  "type": "object"
-               },
-               "spec": {
-                  "description": "Specification of desired Service selection for target discovery by Prometheus.",
-                  "properties": {
-                     "endpoints": {
-                        "description": "A list of endpoints allowed as part of this ServiceMonitor.",
-                        "items": {
-                           "description": "Endpoint defines a scrapeable endpoint serving Prometheus metrics.",
-                           "properties": {
-                              "basicAuth": {
-                                 "description": "BasicAuth allow an endpoint to authenticate over basic authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints",
-                                 "properties": {
-                                    "password": {
-                                       "description": "The secret in the service monitor namespace that contains the password for authentication.",
-                                       "properties": {
-                                          "key": {
-                                             "description": "The key of the secret to select from.  Must be a valid secret key.",
-                                             "type": "string"
-                                          },
-                                          "name": {
-                                             "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?",
-                                             "type": "string"
-                                          },
-                                          "optional": {
-                                             "description": "Specify whether the Secret or its key must be defined",
-                                             "type": "boolean"
-                                          }
-                                       },
-                                       "required": [
-                                          "key"
-                                       ],
-                                       "type": "object"
-                                    },
-                                    "username": {
-                                       "description": "The secret in the service monitor namespace that contains the username for authentication.",
-                                       "properties": {
-                                          "key": {
-                                             "description": "The key of the secret to select from.  Must be a valid secret key.",
-                                             "type": "string"
-                                          },
-                                          "name": {
-                                             "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?",
-                                             "type": "string"
-                                          },
-                                          "optional": {
-                                             "description": "Specify whether the Secret or its key must be defined",
-                                             "type": "boolean"
-                                          }
-                                       },
-                                       "required": [
-                                          "key"
-                                       ],
-                                       "type": "object"
-                                    }
-                                 },
-                                 "type": "object"
-                              },
-                              "bearerTokenFile": {
-                                 "description": "File to read bearer token for scraping targets.",
-                                 "type": "string"
-                              },
-                              "bearerTokenSecret": {
-                                 "description": "Secret to mount to read bearer token for scraping targets. The secret needs to be in the same namespace as the service monitor and accessible by the Prometheus Operator.",
-                                 "properties": {
-                                    "key": {
-                                       "description": "The key of the secret to select from.  Must be a valid secret key.",
-                                       "type": "string"
-                                    },
-                                    "name": {
-                                       "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?",
-                                       "type": "string"
-                                    },
-                                    "optional": {
-                                       "description": "Specify whether the Secret or its key must be defined",
-                                       "type": "boolean"
-                                    }
-                                 },
-                                 "required": [
-                                    "key"
-                                 ],
-                                 "type": "object"
-                              },
-                              "honorLabels": {
-                                 "description": "HonorLabels chooses the metric's labels on collisions with target labels.",
-                                 "type": "boolean"
-                              },
-                              "honorTimestamps": {
-                                 "description": "HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data.",
-                                 "type": "boolean"
-                              },
-                              "interval": {
-                                 "description": "Interval at which metrics should be scraped",
-                                 "type": "string"
-                              },
-                              "metricRelabelings": {
-                                 "description": "MetricRelabelConfigs to apply to samples before ingestion.",
-                                 "items": {
-                                    "description": "RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines `<metric_relabel_configs>`-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs",
-                                    "properties": {
-                                       "action": {
-                                          "description": "Action to perform based on regex matching. Default is 'replace'",
-                                          "type": "string"
-                                       },
-                                       "modulus": {
-                                          "description": "Modulus to take of the hash of the source label values.",
-                                          "format": "int64",
-                                          "type": "integer"
-                                       },
-                                       "regex": {
-                                          "description": "Regular expression against which the extracted value is matched. Default is '(.*)'",
-                                          "type": "string"
-                                       },
-                                       "replacement": {
-                                          "description": "Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1'",
-                                          "type": "string"
-                                       },
-                                       "separator": {
-                                          "description": "Separator placed between concatenated source label values. default is ';'.",
-                                          "type": "string"
-                                       },
-                                       "sourceLabels": {
-                                          "description": "The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions.",
-                                          "items": {
-                                             "type": "string"
-                                          },
-                                          "type": "array"
-                                       },
-                                       "targetLabel": {
-                                          "description": "Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available.",
-                                          "type": "string"
-                                       }
-                                    },
-                                    "type": "object"
-                                 },
-                                 "type": "array"
-                              },
-                              "params": {
-                                 "additionalProperties": {
-                                    "items": {
-                                       "type": "string"
-                                    },
-                                    "type": "array"
-                                 },
-                                 "description": "Optional HTTP URL parameters",
-                                 "type": "object"
-                              },
-                              "path": {
-                                 "description": "HTTP path to scrape for metrics.",
-                                 "type": "string"
-                              },
-                              "port": {
-                                 "description": "Name of the service port this endpoint refers to. Mutually exclusive with targetPort.",
-                                 "type": "string"
-                              },
-                              "proxyUrl": {
-                                 "description": "ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.",
-                                 "type": "string"
-                              },
-                              "relabelings": {
-                                 "description": "RelabelConfigs to apply to samples before scraping. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config",
-                                 "items": {
-                                    "description": "RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines `<metric_relabel_configs>`-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs",
-                                    "properties": {
-                                       "action": {
-                                          "description": "Action to perform based on regex matching. Default is 'replace'",
-                                          "type": "string"
-                                       },
-                                       "modulus": {
-                                          "description": "Modulus to take of the hash of the source label values.",
-                                          "format": "int64",
-                                          "type": "integer"
-                                       },
-                                       "regex": {
-                                          "description": "Regular expression against which the extracted value is matched. Default is '(.*)'",
-                                          "type": "string"
-                                       },
-                                       "replacement": {
-                                          "description": "Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1'",
-                                          "type": "string"
-                                       },
-                                       "separator": {
-                                          "description": "Separator placed between concatenated source label values. default is ';'.",
-                                          "type": "string"
-                                       },
-                                       "sourceLabels": {
-                                          "description": "The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions.",
-                                          "items": {
-                                             "type": "string"
-                                          },
-                                          "type": "array"
-                                       },
-                                       "targetLabel": {
-                                          "description": "Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available.",
-                                          "type": "string"
-                                       }
-                                    },
-                                    "type": "object"
-                                 },
-                                 "type": "array"
-                              },
-                              "scheme": {
-                                 "description": "HTTP scheme to use for scraping.",
-                                 "type": "string"
-                              },
-                              "scrapeTimeout": {
-                                 "description": "Timeout after which the scrape is ended",
-                                 "type": "string"
-                              },
-                              "targetPort": {
-                                 "anyOf": [
-                                    {
-                                       "type": "integer"
-                                    },
-                                    {
-                                       "type": "string"
-                                    }
-                                 ],
-                                 "description": "Name or number of the target port of the endpoint. Mutually exclusive with port.",
-                                 "x-kubernetes-int-or-string": true
-                              },
-                              "tlsConfig": {
-                                 "description": "TLS configuration to use when scraping the endpoint",
-                                 "properties": {
-                                    "ca": {
-                                       "description": "Stuct containing the CA cert to use for the targets.",
-                                       "properties": {
-                                          "configMap": {
-                                             "description": "ConfigMap containing data to use for the targets.",
-                                             "properties": {
-                                                "key": {
-                                                   "description": "The key to select.",
-                                                   "type": "string"
-                                                },
-                                                "name": {
-                                                   "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?",
-                                                   "type": "string"
-                                                },
-                                                "optional": {
-                                                   "description": "Specify whether the ConfigMap or its key must be defined",
-                                                   "type": "boolean"
-                                                }
-                                             },
-                                             "required": [
-                                                "key"
-                                             ],
-                                             "type": "object"
-                                          },
-                                          "secret": {
-                                             "description": "Secret containing data to use for the targets.",
-                                             "properties": {
-                                                "key": {
-                                                   "description": "The key of the secret to select from.  Must be a valid secret key.",
-                                                   "type": "string"
-                                                },
-                                                "name": {
-                                                   "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?",
-                                                   "type": "string"
-                                                },
-                                                "optional": {
-                                                   "description": "Specify whether the Secret or its key must be defined",
-                                                   "type": "boolean"
-                                                }
-                                             },
-                                             "required": [
-                                                "key"
-                                             ],
-                                             "type": "object"
-                                          }
-                                       },
-                                       "type": "object"
-                                    },
-                                    "caFile": {
-                                       "description": "Path to the CA cert in the Prometheus container to use for the targets.",
-                                       "type": "string"
-                                    },
-                                    "cert": {
-                                       "description": "Struct containing the client cert file for the targets.",
-                                       "properties": {
-                                          "configMap": {
-                                             "description": "ConfigMap containing data to use for the targets.",
-                                             "properties": {
-                                                "key": {
-                                                   "description": "The key to select.",
-                                                   "type": "string"
-                                                },
-                                                "name": {
-                                                   "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?",
-                                                   "type": "string"
-                                                },
-                                                "optional": {
-                                                   "description": "Specify whether the ConfigMap or its key must be defined",
-                                                   "type": "boolean"
-                                                }
-                                             },
-                                             "required": [
-                                                "key"
-                                             ],
-                                             "type": "object"
-                                          },
-                                          "secret": {
-                                             "description": "Secret containing data to use for the targets.",
-                                             "properties": {
-                                                "key": {
-                                                   "description": "The key of the secret to select from.  Must be a valid secret key.",
-                                                   "type": "string"
-                                                },
-                                                "name": {
-                                                   "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?",
-                                                   "type": "string"
-                                                },
-                                                "optional": {
-                                                   "description": "Specify whether the Secret or its key must be defined",
-                                                   "type": "boolean"
-                                                }
-                                             },
-                                             "required": [
-                                                "key"
-                                             ],
-                                             "type": "object"
-                                          }
-                                       },
-                                       "type": "object"
-                                    },
-                                    "certFile": {
-                                       "description": "Path to the client cert file in the Prometheus container for the targets.",
-                                       "type": "string"
-                                    },
-                                    "insecureSkipVerify": {
-                                       "description": "Disable target certificate validation.",
-                                       "type": "boolean"
-                                    },
-                                    "keyFile": {
-                                       "description": "Path to the client key file in the Prometheus container for the targets.",
-                                       "type": "string"
-                                    },
-                                    "keySecret": {
-                                       "description": "Secret containing the client key file for the targets.",
-                                       "properties": {
-                                          "key": {
-                                             "description": "The key of the secret to select from.  Must be a valid secret key.",
-                                             "type": "string"
-                                          },
-                                          "name": {
-                                             "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?",
-                                             "type": "string"
-                                          },
-                                          "optional": {
-                                             "description": "Specify whether the Secret or its key must be defined",
-                                             "type": "boolean"
-                                          }
-                                       },
-                                       "required": [
-                                          "key"
-                                       ],
-                                       "type": "object"
-                                    },
-                                    "serverName": {
-                                       "description": "Used to verify the hostname for the targets.",
-                                       "type": "string"
-                                    }
-                                 },
-                                 "type": "object"
-                              }
-                           },
-                           "type": "object"
-                        },
-                        "type": "array"
-                     },
-                     "jobLabel": {
-                        "description": "The label to use to retrieve the job name from.",
-                        "type": "string"
-                     },
-                     "namespaceSelector": {
-                        "description": "Selector to select which namespaces the Endpoints objects are discovered from.",
-                        "properties": {
-                           "any": {
-                              "description": "Boolean describing whether all namespaces are selected in contrast to a list restricting them.",
-                              "type": "boolean"
-                           },
-                           "matchNames": {
-                              "description": "List of namespace names.",
-                              "items": {
-                                 "type": "string"
-                              },
-                              "type": "array"
-                           }
-                        },
-                        "type": "object"
-                     },
-                     "podTargetLabels": {
-                        "description": "PodTargetLabels transfers labels on the Kubernetes Pod onto the target.",
-                        "items": {
-                           "type": "string"
-                        },
-                        "type": "array"
-                     },
-                     "sampleLimit": {
-                        "description": "SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.",
-                        "format": "int64",
-                        "type": "integer"
-                     },
-                     "selector": {
-                        "description": "Selector to select Endpoints objects.",
-                        "properties": {
-                           "matchExpressions": {
-                              "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.",
-                              "items": {
-                                 "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.",
-                                 "properties": {
-                                    "key": {
-                                       "description": "key is the label key that the selector applies to.",
-                                       "type": "string"
-                                    },
-                                    "operator": {
-                                       "description": "operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.",
-                                       "type": "string"
-                                    },
-                                    "values": {
-                                       "description": "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.",
-                                       "items": {
-                                          "type": "string"
-                                       },
-                                       "type": "array"
-                                    }
-                                 },
-                                 "required": [
-                                    "key",
-                                    "operator"
-                                 ],
-                                 "type": "object"
-                              },
-                              "type": "array"
-                           },
-                           "matchLabels": {
-                              "additionalProperties": {
-                                 "type": "string"
-                              },
-                              "description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.",
-                              "type": "object"
-                           }
-                        },
-                        "type": "object"
-                     },
-                     "targetLabels": {
-                        "description": "TargetLabels transfers labels on the Kubernetes Service onto the target.",
-                        "items": {
-                           "type": "string"
-                        },
-                        "type": "array"
-                     }
-                  },
-                  "required": [
-                     "endpoints",
-                     "selector"
-                  ],
-                  "type": "object"
-               }
-            },
-            "required": [
-               "spec"
-            ],
-            "type": "object"
-         }
-      },
-      "version": "v1",
-      "versions": [
-         {
-            "name": "v1",
-            "served": true,
-            "storage": true
-         }
-      ]
-   },
-   "status": {
-      "acceptedNames": {
-         "kind": "",
-         "plural": ""
-      },
-      "conditions": [ ],
-      "storedVersions": [ ]
-   }
-}

manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
@@ -13,446 +13,349 @@ spec:
     plural: servicemonitors
     singular: servicemonitor
   scope: Namespaced
-  validation:
-    openAPIV3Schema:
-      description: ServiceMonitor defines monitoring for a set of services.
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: Specification of desired Service selection for target discovery
-            by Prometheus.
-          properties:
-            endpoints:
-              description: A list of endpoints allowed as part of this ServiceMonitor.
-              items:
-                description: Endpoint defines a scrapeable endpoint serving Prometheus
-                  metrics.
-                properties:
-                  basicAuth:
-                    description: 'BasicAuth allow an endpoint to authenticate over
-                      basic authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints'
-                    properties:
-                      password:
-                        description: The secret in the service monitor namespace that
-                          contains the password for authentication.
-                        properties:
-                          key:
-                            description: The key of the secret to select from.  Must
-                              be a valid secret key.
-                            type: string
-                          name:
-                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                              TODO: Add other useful fields. apiVersion, kind, uid?'
-                            type: string
-                          optional:
-                            description: Specify whether the Secret or its key must
-                              be defined
-                            type: boolean
-                        required:
-                        - key
-                        type: object
-                      username:
-                        description: The secret in the service monitor namespace that
-                          contains the username for authentication.
-                        properties:
-                          key:
-                            description: The key of the secret to select from.  Must
-                              be a valid secret key.
-                            type: string
-                          name:
-                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                              TODO: Add other useful fields. apiVersion, kind, uid?'
-                            type: string
-                          optional:
-                            description: Specify whether the Secret or its key must
-                              be defined
-                            type: boolean
-                        required:
-                        - key
-                        type: object
-                    type: object
-                  bearerTokenFile:
-                    description: File to read bearer token for scraping targets.
-                    type: string
-                  bearerTokenSecret:
-                    description: Secret to mount to read bearer token for scraping
-                      targets. The secret needs to be in the same namespace as the
-                      service monitor and accessible by the Prometheus Operator.
-                    properties:
-                      key:
-                        description: The key of the secret to select from.  Must be
-                          a valid secret key.
-                        type: string
-                      name:
-                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                          TODO: Add other useful fields. apiVersion, kind, uid?'
-                        type: string
-                      optional:
-                        description: Specify whether the Secret or its key must be
-                          defined
-                        type: boolean
-                    required:
-                    - key
-                    type: object
-                  honorLabels:
-                    description: HonorLabels chooses the metric's labels on collisions
-                      with target labels.
-                    type: boolean
-                  honorTimestamps:
-                    description: HonorTimestamps controls whether Prometheus respects
-                      the timestamps present in scraped data.
-                    type: boolean
-                  interval:
-                    description: Interval at which metrics should be scraped
-                    type: string
-                  metricRelabelings:
-                    description: MetricRelabelConfigs to apply to samples before ingestion.
-                    items:
-                      description: 'RelabelConfig allows dynamic rewriting of the
-                        label set, being applied to samples before ingestion. It defines
-                        `<metric_relabel_configs>`-section of Prometheus configuration.
-                        More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: ServiceMonitor defines monitoring for a set of services.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Specification of desired Service selection for target discovery by Prometheus.
+            properties:
+              endpoints:
+                description: A list of endpoints allowed as part of this ServiceMonitor.
+                items:
+                  description: Endpoint defines a scrapeable endpoint serving Prometheus metrics.
+                  properties:
+                    basicAuth:
+                      description: 'BasicAuth allow an endpoint to authenticate over basic authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints'
                       properties:
-                        action:
-                          description: Action to perform based on regex matching.
-                            Default is 'replace'
-                          type: string
-                        modulus:
-                          description: Modulus to take of the hash of the source label
-                            values.
-                          format: int64
-                          type: integer
-                        regex:
-                          description: Regular expression against which the extracted
-                            value is matched. Default is '(.*)'
-                          type: string
-                        replacement:
-                          description: Replacement value against which a regex replace
-                            is performed if the regular expression matches. Regex
-                            capture groups are available. Default is '$1'
-                          type: string
-                        separator:
-                          description: Separator placed between concatenated source
-                            label values. default is ';'.
-                          type: string
-                        sourceLabels:
-                          description: The source labels select values from existing
-                            labels. Their content is concatenated using the configured
-                            separator and matched against the configured regular expression
-                            for the replace, keep, and drop actions.
-                          items:
-                            type: string
-                          type: array
-                        targetLabel:
-                          description: Label to which the resulting value is written
-                            in a replace action. It is mandatory for replace actions.
-                            Regex capture groups are available.
-                          type: string
+                        password:
+                          description: The secret in the service monitor namespace that contains the password for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must be a valid secret key.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                        username:
+                          description: The secret in the service monitor namespace that contains the username for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must be a valid secret key.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
                       type: object
-                    type: array
-                  params:
-                    additionalProperties:
+                    bearerTokenFile:
+                      description: File to read bearer token for scraping targets.
+                      type: string
+                    bearerTokenSecret:
+                      description: Secret to mount to read bearer token for scraping targets. The secret needs to be in the same namespace as the service monitor and accessible by the Prometheus Operator.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must be a valid secret key.
+                          type: string
+                        name:
+                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                    honorLabels:
+                      description: HonorLabels chooses the metric's labels on collisions with target labels.
+                      type: boolean
+                    honorTimestamps:
+                      description: HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data.
+                      type: boolean
+                    interval:
+                      description: Interval at which metrics should be scraped
+                      type: string
+                    metricRelabelings:
+                      description: MetricRelabelConfigs to apply to samples before ingestion.
                       items:
-                        type: string
+                        description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines `<metric_relabel_configs>`-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
+                        properties:
+                          action:
+                            description: Action to perform based on regex matching. Default is 'replace'
+                            type: string
+                          modulus:
+                            description: Modulus to take of the hash of the source label values.
+                            format: int64
+                            type: integer
+                          regex:
+                            description: Regular expression against which the extracted value is matched. Default is '(.*)'
+                            type: string
+                          replacement:
+                            description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1'
+                            type: string
+                          separator:
+                            description: Separator placed between concatenated source label values. default is ';'.
+                            type: string
+                          sourceLabels:
+                            description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions.
+                            items:
+                              type: string
+                            type: array
+                          targetLabel:
+                            description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available.
+                            type: string
+                        type: object
                       type: array
-                    description: Optional HTTP URL parameters
-                    type: object
-                  path:
-                    description: HTTP path to scrape for metrics.
-                    type: string
-                  port:
-                    description: Name of the service port this endpoint refers to.
-                      Mutually exclusive with targetPort.
-                    type: string
-                  proxyUrl:
-                    description: ProxyURL eg http://proxyserver:2195 Directs scrapes
-                      to proxy through this endpoint.
-                    type: string
-                  relabelings:
-                    description: 'RelabelConfigs to apply to samples before scraping.
-                      More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
-                    items:
-                      description: 'RelabelConfig allows dynamic rewriting of the
-                        label set, being applied to samples before ingestion. It defines
-                        `<metric_relabel_configs>`-section of Prometheus configuration.
-                        More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
-                      properties:
-                        action:
-                          description: Action to perform based on regex matching.
-                            Default is 'replace'
-                          type: string
-                        modulus:
-                          description: Modulus to take of the hash of the source label
-                            values.
-                          format: int64
-                          type: integer
-                        regex:
-                          description: Regular expression against which the extracted
-                            value is matched. Default is '(.*)'
-                          type: string
-                        replacement:
-                          description: Replacement value against which a regex replace
-                            is performed if the regular expression matches. Regex
-                            capture groups are available. Default is '$1'
-                          type: string
-                        separator:
-                          description: Separator placed between concatenated source
-                            label values. default is ';'.
-                          type: string
-                        sourceLabels:
-                          description: The source labels select values from existing
-                            labels. Their content is concatenated using the configured
-                            separator and matched against the configured regular expression
-                            for the replace, keep, and drop actions.
-                          items:
-                            type: string
-                          type: array
-                        targetLabel:
-                          description: Label to which the resulting value is written
-                            in a replace action. It is mandatory for replace actions.
-                            Regex capture groups are available.
-                          type: string
-                      type: object
-                    type: array
-                  scheme:
-                    description: HTTP scheme to use for scraping.
-                    type: string
-                  scrapeTimeout:
-                    description: Timeout after which the scrape is ended
-                    type: string
-                  targetPort:
-                    anyOf:
-                    - type: integer
-                    - type: string
-                    description: Name or number of the target port of the endpoint.
-                      Mutually exclusive with port.
-                    x-kubernetes-int-or-string: true
-                  tlsConfig:
-                    description: TLS configuration to use when scraping the endpoint
-                    properties:
-                      ca:
-                        description: Stuct containing the CA cert to use for the targets.
-                        properties:
-                          configMap:
-                            description: ConfigMap containing data to use for the
-                              targets.
-                            properties:
-                              key:
-                                description: The key to select.
-                                type: string
-                              name:
-                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                  TODO: Add other useful fields. apiVersion, kind,
-                                  uid?'
-                                type: string
-                              optional:
-                                description: Specify whether the ConfigMap or its
-                                  key must be defined
-                                type: boolean
-                            required:
-                            - key
-                            type: object
-                          secret:
-                            description: Secret containing data to use for the targets.
-                            properties:
-                              key:
-                                description: The key of the secret to select from.  Must
-                                  be a valid secret key.
-                                type: string
-                              name:
-                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                  TODO: Add other useful fields. apiVersion, kind,
-                                  uid?'
-                                type: string
-                              optional:
-                                description: Specify whether the Secret or its key
-                                  must be defined
-                                type: boolean
-                            required:
-                            - key
-                            type: object
-                        type: object
-                      caFile:
-                        description: Path to the CA cert in the Prometheus container
-                          to use for the targets.
-                        type: string
-                      cert:
-                        description: Struct containing the client cert file for the
-                          targets.
-                        properties:
-                          configMap:
-                            description: ConfigMap containing data to use for the
-                              targets.
-                            properties:
-                              key:
-                                description: The key to select.
-                                type: string
-                              name:
-                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                  TODO: Add other useful fields. apiVersion, kind,
-                                  uid?'
-                                type: string
-                              optional:
-                                description: Specify whether the ConfigMap or its
-                                  key must be defined
-                                type: boolean
-                            required:
-                            - key
-                            type: object
-                          secret:
-                            description: Secret containing data to use for the targets.
-                            properties:
-                              key:
-                                description: The key of the secret to select from.  Must
-                                  be a valid secret key.
-                                type: string
-                              name:
-                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                  TODO: Add other useful fields. apiVersion, kind,
-                                  uid?'
-                                type: string
-                              optional:
-                                description: Specify whether the Secret or its key
-                                  must be defined
-                                type: boolean
-                            required:
-                            - key
-                            type: object
-                        type: object
-                      certFile:
-                        description: Path to the client cert file in the Prometheus
-                          container for the targets.
-                        type: string
-                      insecureSkipVerify:
-                        description: Disable target certificate validation.
-                        type: boolean
-                      keyFile:
-                        description: Path to the client key file in the Prometheus
-                          container for the targets.
-                        type: string
-                      keySecret:
-                        description: Secret containing the client key file for the
-                          targets.
-                        properties:
-                          key:
-                            description: The key of the secret to select from.  Must
-                              be a valid secret key.
-                            type: string
-                          name:
-                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                              TODO: Add other useful fields. apiVersion, kind, uid?'
-                            type: string
-                          optional:
-                            description: Specify whether the Secret or its key must
-                              be defined
-                            type: boolean
-                        required:
-                        - key
-                        type: object
-                      serverName:
-                        description: Used to verify the hostname for the targets.
-                        type: string
-                    type: object
-                type: object
-              type: array
-            jobLabel:
-              description: The label to use to retrieve the job name from.
-              type: string
-            namespaceSelector:
-              description: Selector to select which namespaces the Endpoints objects
-                are discovered from.
-              properties:
-                any:
-                  description: Boolean describing whether all namespaces are selected
-                    in contrast to a list restricting them.
-                  type: boolean
-                matchNames:
-                  description: List of namespace names.
-                  items:
-                    type: string
-                  type: array
-              type: object
-            podTargetLabels:
-              description: PodTargetLabels transfers labels on the Kubernetes Pod
-                onto the target.
-              items:
-                type: string
-              type: array
-            sampleLimit:
-              description: SampleLimit defines per-scrape limit on number of scraped
-                samples that will be accepted.
-              format: int64
-              type: integer
-            selector:
-              description: Selector to select Endpoints objects.
-              properties:
-                matchExpressions:
-                  description: matchExpressions is a list of label selector requirements.
-                    The requirements are ANDed.
-                  items:
-                    description: A label selector requirement is a selector that contains
-                      values, a key, and an operator that relates the key and values.
-                    properties:
-                      key:
-                        description: key is the label key that the selector applies
-                          to.
-                        type: string
-                      operator:
-                        description: operator represents a key's relationship to a
-                          set of values. Valid operators are In, NotIn, Exists and
-                          DoesNotExist.
-                        type: string
-                      values:
-                        description: values is an array of string values. If the operator
-                          is In or NotIn, the values array must be non-empty. If the
-                          operator is Exists or DoesNotExist, the values array must
-                          be empty. This array is replaced during a strategic merge
-                          patch.
+                    params:
+                      additionalProperties:
                         items:
                           type: string
                         type: array
-                    required:
-                    - key
-                    - operator
-                    type: object
-                  type: array
-                matchLabels:
-                  additionalProperties:
-                    type: string
-                  description: matchLabels is a map of {key,value} pairs. A single
-                    {key,value} in the matchLabels map is equivalent to an element
-                    of matchExpressions, whose key field is "key", the operator is
-                    "In", and the values array contains only "value". The requirements
-                    are ANDed.
+                      description: Optional HTTP URL parameters
+                      type: object
+                    path:
+                      description: HTTP path to scrape for metrics.
+                      type: string
+                    port:
+                      description: Name of the service port this endpoint refers to. Mutually exclusive with targetPort.
+                      type: string
+                    proxyUrl:
+                      description: ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.
+                      type: string
+                    relabelings:
+                      description: 'RelabelConfigs to apply to samples before scraping. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
+                      items:
+                        description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines `<metric_relabel_configs>`-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
+                        properties:
+                          action:
+                            description: Action to perform based on regex matching. Default is 'replace'
+                            type: string
+                          modulus:
+                            description: Modulus to take of the hash of the source label values.
+                            format: int64
+                            type: integer
+                          regex:
+                            description: Regular expression against which the extracted value is matched. Default is '(.*)'
+                            type: string
+                          replacement:
+                            description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1'
+                            type: string
+                          separator:
+                            description: Separator placed between concatenated source label values. default is ';'.
+                            type: string
+                          sourceLabels:
+                            description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions.
+                            items:
+                              type: string
+                            type: array
+                          targetLabel:
+                            description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available.
+                            type: string
+                        type: object
+                      type: array
+                    scheme:
+                      description: HTTP scheme to use for scraping.
+                      type: string
+                    scrapeTimeout:
+                      description: Timeout after which the scrape is ended
+                      type: string
+                    targetPort:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      description: Name or number of the pod port this endpoint refers to. Mutually exclusive with port.
+                      x-kubernetes-int-or-string: true
+                    tlsConfig:
+                      description: TLS configuration to use when scraping the endpoint
+                      properties:
+                        ca:
+                          description: Stuct containing the CA cert to use for the targets.
+                          properties:
+                            configMap:
+                              description: ConfigMap containing data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                            secret:
+                              description: Secret containing data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must be a valid secret key.
+                                  type: string
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                          type: object
+                        caFile:
+                          description: Path to the CA cert in the Prometheus container to use for the targets.
+                          type: string
+                        cert:
+                          description: Struct containing the client cert file for the targets.
+                          properties:
+                            configMap:
+                              description: ConfigMap containing data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                            secret:
+                              description: Secret containing data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must be a valid secret key.
+                                  type: string
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                          type: object
+                        certFile:
+                          description: Path to the client cert file in the Prometheus container for the targets.
+                          type: string
+                        insecureSkipVerify:
+                          description: Disable target certificate validation.
+                          type: boolean
+                        keyFile:
+                          description: Path to the client key file in the Prometheus container for the targets.
+                          type: string
+                        keySecret:
+                          description: Secret containing the client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must be a valid secret key.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                        serverName:
+                          description: Used to verify the hostname for the targets.
+                          type: string
+                      type: object
                   type: object
-              type: object
-            targetLabels:
-              description: TargetLabels transfers labels on the Kubernetes Service
-                onto the target.
-              items:
+                type: array
+              jobLabel:
+                description: The label to use to retrieve the job name from.
                 type: string
-              type: array
-          required:
-          - endpoints
-          - selector
-          type: object
-      required:
-      - spec
-      type: object
-  version: v1
-  versions:
-  - name: v1
+              namespaceSelector:
+                description: Selector to select which namespaces the Endpoints objects are discovered from.
+                properties:
+                  any:
+                    description: Boolean describing whether all namespaces are selected in contrast to a list restricting them.
+                    type: boolean
+                  matchNames:
+                    description: List of namespace names.
+                    items:
+                      type: string
+                    type: array
+                type: object
+              podTargetLabels:
+                description: PodTargetLabels transfers labels on the Kubernetes Pod onto the target.
+                items:
+                  type: string
+                type: array
+              sampleLimit:
+                description: SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
+                format: int64
+                type: integer
+              selector:
+                description: Selector to select Endpoints objects.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                    items:
+                      description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies to.
+                          type: string
+                        operator:
+                          description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+              targetLabels:
+                description: TargetLabels transfers labels on the Kubernetes Service onto the target.
+                items:
+                  type: string
+                type: array
+            required:
+            - endpoints
+            - selector
+            type: object
+        required:
+        - spec
+        type: object
     served: true
     storage: true
 status:

manifests/setup/prometheus-operator-clusterRole.yaml

@@ -4,29 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.37.0
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
 rules:
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - customresourcedefinitions
-  verbs:
-  - create
-- apiGroups:
-  - apiextensions.k8s.io
-  resourceNames:
-  - alertmanagers.monitoring.coreos.com
-  - podmonitors.monitoring.coreos.com
-  - prometheuses.monitoring.coreos.com
-  - prometheusrules.monitoring.coreos.com
-  - servicemonitors.monitoring.coreos.com
-  - thanosrulers.monitoring.coreos.com
-  resources:
-  - customresourcedefinitions
-  verbs:
-  - get
-  - update
 - apiGroups:
   - monitoring.coreos.com
   resources:
@@ -87,3 +67,15 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
+- apiGroups:
+  - authorization.k8s.io
+  resources:
+  - subjectaccessreviews
+  verbs:
+  - create

manifests/setup/prometheus-operator-clusterRoleBinding.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.37.0
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

manifests/setup/prometheus-operator-deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.37.0
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
   namespace: monitoring
 spec:
@@ -18,15 +18,15 @@ spec:
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/name: prometheus-operator
-        app.kubernetes.io/version: v0.37.0
+        app.kubernetes.io/version: v0.40.0
     spec:
       containers:
       - args:
         - --kubelet-service=kube-system/kubelet
         - --logtostderr=true
         - --config-reloader-image=carlosedp/configmap-reload:latest
-        - --prometheus-config-reloader=carlosedp/prometheus-config-reloader:v0.37.0
-        image: carlosedp/prometheus-operator:v0.37.0
+        - --prometheus-config-reloader=carlosedp/prometheus-config-reloader:v0.40.0
+        image: carlosedp/prometheus-operator:v0.40.0
         name: prometheus-operator
         ports:
         - containerPort: 8080
@@ -40,6 +40,18 @@ spec:
             memory: 100Mi
         securityContext:
           allowPrivilegeEscalation: false
+      - args:
+        - --logtostderr
+        - --secure-listen-address=:8443
+        - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
+        - --upstream=http://127.0.0.1:8080/
+        image: carlosedp/kube-rbac-proxy:v0.5.0
+        name: kube-rbac-proxy
+        ports:
+        - containerPort: 8443
+          name: https
+        securityContext:
+          runAsUser: 65534
       nodeSelector:
         beta.kubernetes.io/os: linux
       securityContext:

manifests/setup/prometheus-operator-service.yaml

@@ -4,15 +4,15 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.37.0
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
   namespace: monitoring
 spec:
   clusterIP: None
   ports:
-  - name: http
-    port: 8080
-    targetPort: http
+  - name: https
+    port: 8443
+    targetPort: https
   selector:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator

manifests/setup/prometheus-operator-serviceAccount.yaml

@@ -4,6 +4,6 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.37.0
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
   namespace: monitoring

modules/arm_exporter.jsonnet

@@ -49,6 +49,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
           '/bin/rpi_exporter',
           '--web.listen-address=127.0.0.1:9243',
         ]) +
+        container.mixin.securityContext.withPrivileged(true) +
         container.mixin.resources.withRequests({ cpu: '50m', memory: '50Mi' }) +
         container.mixin.resources.withLimits({ cpu: '100m', memory: '100Mi' });
 

modules/elasticsearch_exporter.jsonnet

@@ -20,8 +20,8 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
 
     // Add custom dashboards
     grafanaDashboards+:: {
-      'elasticsearch-dashboard.json': (import 'grafana-dashboards/elasticsearch-dashboard.json'),
-      'fluentd-dashboard.json': (import 'grafana-dashboards/fluentd-dashboard.json'),
+      'elasticsearch-dashboard.json': (import '../grafana-dashboards/elasticsearch-dashboard.json'),
+      'fluentd-dashboard.json': (import '../grafana-dashboards/fluentd-dashboard.json'),
     },
   },
 

modules/k3s-overrides.jsonnet

@@ -1,6 +1,8 @@
 local utils = import '../utils.libsonnet';
 local vars = import '../vars.jsonnet';
 local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
+local service = k.core.v1.service;
+local servicePort = k.core.v1.service.mixin.spec.portsType;
 
 {
   prometheus+:: {
@@ -9,5 +11,17 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
 
     kubeSchedulerPrometheusDiscoveryEndpoints:
       utils.newEndpoint('kube-scheduler-prometheus-discovery', 'kube-system', vars.k3s.master_ip, 'http-metrics', 10251),
+
+    kubeControllerManagerPrometheusDiscoveryService:
+      service.new('kube-controller-manager-prometheus-discovery', {}, servicePort.newNamed('http-metrics', 10252, 10252)) +
+      service.mixin.metadata.withNamespace('kube-system') +
+      service.mixin.metadata.withLabels({ 'k8s-app': 'kube-controller-manager' }) +
+      service.mixin.spec.withClusterIp('None'),
+
+    kubeSchedulerPrometheusDiscoveryService:
+      service.new('kube-scheduler-prometheus-discovery', {}, servicePort.newNamed('http-metrics', 10251, 10251)) +
+      service.mixin.metadata.withNamespace('kube-system') +
+      service.mixin.metadata.withLabels({ 'k8s-app': 'kube-scheduler' }) +
+      service.mixin.spec.withClusterIp('None'),
   },
 }

modules/metallb.jsonnet

@@ -24,5 +24,20 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
       service.mixin.metadata.withNamespace('metallb-system') +
       service.mixin.metadata.withLabels({ 'k8s-app': 'metallb-controller' }) +
       service.mixin.spec.withClusterIp('None'),
+
+    clusterRole:
+      utils.newClusterRole('metallb-exporter', [
+        {
+          apis: [''],
+          res: ['services', 'endpoints', 'pods'],
+          verbs: ['get', 'list', 'watch'],
+        },
+      ], null),
+
+
+    clusterRoleBinding:
+      utils.newClusterRoleBinding('metallb-exporter', 'prometheus-k8s', $._config.namespace, 'metallb-exporter', null),
+
+
   },
 }

modules/nginx.jsonnet

@@ -0,0 +1,44 @@
+local utils = import '../utils.libsonnet';
+local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
+
+{
+  _config+:: {
+    namespace: 'monitoring',
+    grafanaDashboards+:: {
+      'nginx-dashboard.json': (import '../grafana-dashboards/nginx-dashboard.json'),
+    },
+  },
+
+  nginxExporter+:: {
+    serviceMonitor:
+      utils.newServiceMonitor('nginx', $._config.namespace, { 'app.kubernetes.io/name': 'ingress-nginx' }, 'ingress-nginx', 'prometheus', 'http'),
+
+    service:
+      local service = k.core.v1.service;
+      local servicePort = k.core.v1.service.mixin.spec.portsType;
+      local nginxPort = servicePort.newNamed('prometheus', 10254, 10254);
+
+      service.new('ingress-nginx-metrics', {'app.kubernetes.io/name': 'ingress-nginx'}, nginxPort) +
+      service.mixin.metadata.withNamespace('ingress-nginx') +
+      service.mixin.metadata.withLabels({'app.kubernetes.io/name': 'ingress-nginx'}) +
+      service.mixin.spec.withClusterIp('None'),
+
+    clusterRole:
+      utils.newClusterRole('nginx-exporter', [
+        {
+          apis: [''],
+          res: ['services', 'endpoints', 'pods'],
+          verbs: ['get', 'list', 'watch'],
+        },
+      ], null),
+
+
+    serviceAccount:
+      utils.newServiceAccount('nginx-exporter', $._config.namespace, null),
+
+
+    clusterRoleBinding:
+      utils.newClusterRoleBinding('nginx-exporter', 'nginx-exporter', $._config.namespace, 'nginx-exporter', null),
+
+  },
+}

modules/smtp_relay.jsonnet

@@ -5,15 +5,15 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
     namespace: 'monitoring',
 
     versions+:: {
-      smtpServer: 'v1.0.1',
+      smtpRelay: 'v1.0.1',
     },
 
     imageRepos+:: {
-      smtpServer: 'carlosedp/docker-smtp',
+      smtpRelay: 'carlosedp/docker-smtp',
     },
   },
 
-  smtpServer+:: {
+  smtpRelay+:: {
     deployment:
       local deployment = k.apps.v1.deployment;
       local container = k.apps.v1.deployment.mixin.spec.template.spec.containersType;
@@ -21,8 +21,8 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
 
       local podLabels = { run: 'smtp-server' };
 
-      local smtpServer =
-        container.new('smtp-server', $._config.imageRepos.smtpServer + ':' + $._config.versions.smtpServer) +
+      local smtpRelay =
+        container.new('smtp-server', $._config.imageRepos.smtpRelay + ':' + $._config.versions.smtpRelay) +
         container.withPorts(containerPort.newNamed(25, 'smtp')) +
         container.withEnv([
           {
@@ -44,7 +44,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
           { name: 'RELAY_DOMAINS', value: ':192.168.0.0/24:10.0.0.0/16' },
         ]);
 
-      local c = [smtpServer];
+      local c = [smtpRelay];
 
       deployment.new('smtp-server', 1, c, podLabels) +
       deployment.mixin.metadata.withNamespace($._config.namespace) +
@@ -54,9 +54,9 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
     service:
       local service = k.core.v1.service;
       local servicePort = k.core.v1.service.mixin.spec.portsType;
-      local smtpServerPorts = servicePort.newNamed('smtp', 25, 'smtp');
+      local smtpRelayPorts = servicePort.newNamed('smtp', 25, 'smtp');
 
-      service.new('smtp-server', $.smtpServer.deployment.spec.selector.matchLabels, smtpServerPorts) +
+      service.new('smtp-server', $.smtpRelay.deployment.spec.selector.matchLabels, smtpRelayPorts) +
       service.mixin.metadata.withNamespace($._config.namespace) +
       service.mixin.metadata.withLabels({ run: 'smtp-server' }),
   },

modules/speedtest_exporter.jsonnet

@@ -0,0 +1,51 @@
+local utils = import '../utils.libsonnet';
+local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
+
+{
+  _config+:: {
+    namespace: 'monitoring',
+    replicas: 1,
+
+    imageRepos+:: {
+      speedtestExporter: 'ghcr.io/miguelndecarvalho/speedtest-exporter',  
+    },
+
+    // Add custom dashboards
+    grafanaDashboards+:: {
+      'speedtest-exporter-dashboard.json': (import '../grafana-dashboards/speedtest-exporter-dashboard.json'),
+    },
+  },
+
+  speedtestExporter+:: {
+    deployment:
+      local deployment = k.apps.v1.deployment;
+      local container = k.apps.v1.deployment.mixin.spec.template.spec.containersType;
+      local containerPort = container.portsType;
+
+      local podLabels = { 'k8s-app': 'speedtest-exporter' };
+      local speedtestExporter =
+        container.new('speedtest-exporter',
+                      $._config.imageRepos.speedtestExporter) +
+        container.withPorts(containerPort.newNamed(9798, 'metrics'));
+
+      local c = [speedtestExporter];
+
+      deployment.new('speedtest-exporter', $._config.replicas, c, podLabels) +
+      deployment.mixin.metadata.withNamespace($._config.namespace) +
+      deployment.mixin.metadata.withLabels(podLabels) +
+      deployment.mixin.spec.selector.withMatchLabels(podLabels) +
+      deployment.mixin.spec.template.spec.withRestartPolicy('Always'),
+
+    service:
+      local service = k.core.v1.service;
+      local servicePort = k.core.v1.service.mixin.spec.portsType;
+      local speedtestExporterPorts = servicePort.newNamed('metrics', 9798, 'metrics');
+
+      service.new('speedtest-exporter', $.speedtestExporter.deployment.spec.selector.matchLabels, speedtestExporterPorts) +
+      service.mixin.metadata.withNamespace($._config.namespace) +
+      service.mixin.metadata.withLabels({ 'k8s-app': 'speedtest-exporter' }),
+
+    serviceMonitor:
+      utils.newServiceMonitor('speedtest-exporter', $._config.namespace, { 'k8s-app': 'speedtest-exporter' }, $._config.namespace, 'metrics', 'http', 'metrics', '30m', '2m'),
+  },
+}

modules/traefik.jsonnet

@@ -6,7 +6,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
     namespace: 'monitoring',
     // Add custom dashboards
     grafanaDashboards+:: {
-      'traefik-dashboard.json': (import 'grafana-dashboards/traefik-dashboard.json'),
+      'traefik-dashboard.json': (import '../grafana-dashboards/traefik-dashboard.json'),
     },
   },
 

modules/ups_exporter.jsonnet

@@ -11,7 +11,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
 
     // Add custom dashboards
     grafanaDashboards+:: {
-      'apc-ups-dashboard.json': (import 'grafana-dashboards/apc-ups-dashboard.json'),
+      'apc-ups-dashboard.json': (import '../grafana-dashboards/apc-ups-dashboard.json'),
     },
   },
 

samples/sample-pv-grafana.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: grafana
+  labels:
+    type: local
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: "/data/k3s-storage/grafana/"

samples/sample-pv-prometheus.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: prometheus
+  labels:
+    type: local
+spec:
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: "/data/k3s-storage/prometheus/"

scripts/build.sh

@@ -20,4 +20,10 @@ rm -rf manifests
 mkdir -p manifests/setup
 
 # optional, but we would like to generate yaml, not json
-$JSONNET_BIN -J vendor -m manifests "${1-example.jsonnet}" | xargs -I{} sh -c 'cat {} | $(go env GOPATH)/bin/gojsontoyaml > {}.yaml; rm -f {}' -- {}
+$JSONNET_BIN -J vendor -m manifests "${1-example.jsonnet}" | while IFS= read -r file; do
+    "$(go env GOPATH)/bin/gojsontoyaml" <"$file" >"$file.yaml"
+    rm -f "$file"
+done
+
+# Clean-up json files from manifests dir
+find manifests -type f ! -name '*.yaml' -delete

scripts/build_images.sh

@@ -8,11 +8,10 @@ export DOCKER_CLI_EXPERIMENTAL=enabled
 REPO=carlosedp
 
 export AOR_VERSION=2.3
-export PROM_ADAPTER_VERSION=v0.6.0
-export KSM_VERSION=v1.9.5
-export PROM_OP_VERSION=v0.37.0
+export KSM_VERSION=v1.9.6
+export PROM_OP_VERSION=v0.40.0
 export KUBE_RBAC_VERSION=v0.5.0
-export PROM_CONFIG_RELOADER_VERSION=v0.37.0
+export PROM_CONFIG_RELOADER_VERSION=v0.40.0
 export CONFIGMAP_RELOAD_VERSION=latest
 #-------------------------------------------------------------------------------
 # Kubernetes addon-resizer
@@ -39,32 +38,6 @@ for arch in $ALL_ARCH; do
     docker rmi $REPO/$IMAGE:$AOR_VERSION-$arch
 done
 
-#-------------------------------------------------------------------------------
-# Prometheus-adapter
-# Retag prometheus-adapter from directxman12 images to have unified manifest on DockerHub
-
-ALL_ARCH=(amd64 arm arm64 ppc64le)
-IMAGE=k8s-prometheus-adapter
-
-for arch in $ALL_ARCH; do
-    if [[ $arch == "arm" ]]; then archdocker="arm32v7";
-    elif [[ $arch == "arm64" ]]; then archdocker="arm64v8";
-    else archdocker="$arch"; fi
-    docker pull directxman12/$IMAGE-$arch:$PROM_ADAPTER_VERSION
-    docker tag directxman12/$IMAGE-$arch:$PROM_ADAPTER_VERSION $REPO/$IMAGE:$PROM_ADAPTER_VERSION-$arch
-    docker push $REPO/$IMAGE:$PROM_ADAPTER_VERSION-$arch
-done
-
-
-docker manifest create --amend $REPO/$IMAGE:$PROM_ADAPTER_VERSION `echo $ALL_ARCH | sed -e "s~[^ ]*~$REPO/$IMAGE:$PROM_ADAPTER_VERSION\-&~g"`
-for arch in $ALL_ARCH; do docker manifest annotate --arch $arch $REPO/$IMAGE:$PROM_ADAPTER_VERSION $REPO/$IMAGE:$PROM_ADAPTER_VERSION-$arch; done
-docker manifest push --purge $REPO/$IMAGE:$PROM_ADAPTER_VERSION
-
-for arch in $ALL_ARCH; do
-    docker rmi directxman12/$IMAGE-$arch:$PROM_ADAPTER_VERSION
-    docker rmi $REPO/$IMAGE:$PROM_ADAPTER_VERSION-$arch
-done
-
 #-------------------------------------------------------------------------------
 # Kube-state-metrics
 IMAGE=carlosedp/kube-state-metrics
@@ -113,9 +86,8 @@ for arch in $ALL_ARCH; do
 
     cat Dockerfile |sed -e 's/\.build\/linux-amd64\/operator/operator/' |sed -e "s/^FROM.*/FROM $archdocker\/busybox/" > Dockerfile.custom
     CGO_ENABLED=0 GOOS=linux GOARCH=$arch go build -ldflags="-s -X github.com/coreos/prometheus-operator/pkg/version.Version=$(cat VERSION | tr -d " \t\n\r")" -o operator cmd/operator/main.go
-    rm -rf operator
     docker build -t $REPO/prometheus-operator:${PROM_OP_VERSION}-$arch -f Dockerfile.custom .
-    docker push $REPO/prometheus-operator:$PROM_OP_VERSION-arm
+    docker push $REPO/prometheus-operator:$PROM_OP_VERSION-$arch
 done
 
 
@@ -123,6 +95,7 @@ docker manifest create --amend $IMAGE:$PROM_OP_VERSION `echo $ALL_ARCH | sed -e
 for arch in $ALL_ARCH; do docker manifest annotate --arch $arch $IMAGE:$PROM_OP_VERSION $IMAGE:$PROM_OP_VERSION-$arch; done
 docker manifest push --purge $IMAGE:$PROM_OP_VERSION
 
+
 for arch in $ALL_ARCH; do
     docker rmi $REPO/prometheus-operator:$PROM_OP_VERSION-$arch
 done
@@ -173,7 +146,7 @@ ALL_ARCH=(amd64 arm arm64 ppc64le)
 
 pushd $GOPATH/src/github.com/coreos/prometheus-operator
 cd $GOPATH/src/github.com/coreos/prometheus-operator/cmd/prometheus-config-reloader
-git checkout ${VERSION}
+git checkout ${PROM_CONFIG_RELOADER_VERSION}
 
 for arch in $ALL_ARCH; do
     if [[ $arch == "arm" ]]; then archdocker="arm32v7";

utils.libsonnet

@@ -91,38 +91,53 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
   ),
 
   // Creates ingress objects
-  newIngress(name, namespace, host, path, serviceName, servicePort):: (
-    local ingress = k.extensions.v1beta1.ingress;
-    local ingressTls = ingress.mixin.spec.tlsType;
-    local ingressRule = ingress.mixin.spec.rulesType;
-    local httpIngressPath = ingressRule.mixin.http.pathsType;
+  newIngress(name, namespace, hosts, path, serviceName, servicePort):: (
+    {
+      apiVersion: 'networking.k8s.io/v1',
+      kind: 'Ingress',
+      metadata: {
+        name: name,
+        namespace: namespace,
+      },
+      spec: {
+        rules: [$.newIngressHost(host, path, serviceName, servicePort) for host in hosts],
+      },
+    }
+  ),
 
-    ingress.new()
-    + ingress.mixin.metadata.withName(name)
-    + ingress.mixin.metadata.withNamespace(namespace)
-    + ingress.mixin.spec.withRules(
-      ingressRule.new()
-      + ingressRule.withHost(host)
-      + ingressRule.mixin.http.withPaths(
-        httpIngressPath.new()
-        + httpIngressPath.withPath(path)
-        + httpIngressPath.mixin.backend.withServiceName(serviceName)
-        + httpIngressPath.mixin.backend.withServicePort(servicePort)
-      ),
-    )
+  // Add host to Ingress resource
+  newIngressHost(host, path, serviceName, servicePort):: (
+    {
+      host: host,
+      http: {
+        paths: [
+          {
+            backend: {
+              service: {
+                name: serviceName,
+                port: {
+                  name: servicePort,
+                },
+              },
+            },
+            path: path,
+            pathType: 'Prefix',
+          },
+        ],
+      },
+    }
   ),
 
   // Add TLS to Ingress resource with secret containing the certificates if exists
-  addIngressTLS(I, S=''):: (
-    local ingress = k.extensions.v1beta1.ingress;
+  addIngressTLS(I, hosts, secretName=''):: (
+    local ingress = k.networking.v1beta1.ingress;
     local ingressTls = ingress.mixin.spec.tlsType;
-    local host = I.spec.rules[0].host;
     local namespace = I.metadata.namespace;
 
     I + ingress.mixin.spec.withTls(
       ingressTls.new() +
-      ingressTls.withHosts(host) +
-      (if S != '' then { secretName: S } else {})
+      ingressTls.withHosts(hosts) +
+      (if secretName != '' then { secretName: secretName } else {})
     )
   ),
 
@@ -130,7 +145,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
   newTLSSecret(name, namespace, crt, key):: (
     local secret = k.core.v1.secret;
 
-    secret.new('ingress-secret') +
+    secret.new(name) +
     secret.mixin.metadata.withNamespace(namespace) +
     secret.withType('kubernetes.io/tls') +
     secret.withData(
@@ -175,7 +190,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
   ),
 
   // Creates http ServiceMonitor objects
-  newServiceMonitor(name, namespace, matchLabel, matchNamespace, portName, portScheme, path='metrics'):: (
+  newServiceMonitor(name, namespace, matchLabel, matchNamespace, portName, portScheme, path='metrics', interval='30s', timeout='30s'):: (
     {
       apiVersion: 'monitoring.coreos.com/v1',
       kind: 'ServiceMonitor',
@@ -195,7 +210,8 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
           {
             port: portName,
             scheme: portScheme,
-            interval: '30s',
+            interval: interval,
+            scrapeTimeout: timeout,
             relabelings: [
               {
                 action: 'replace',

vars.jsonnet

@@ -25,6 +25,11 @@
       enabled: false,
       file: import 'modules/metallb.jsonnet',
     },
+    {
+      name: 'nginxExporter',
+      enabled: false,
+      file: import 'modules/nginx.jsonnet',
+    },
     {
       name: 'traefikExporter',
       enabled: false,
@@ -35,15 +40,23 @@
       enabled: false,
       file: import 'modules/elasticsearch_exporter.jsonnet',
     },
+    {
+      name: 'speedtestExporter',
+      enabled: false,
+      file: import 'modules/speedtest_exporter.jsonnet',
+    },
   ],
 
   k3s: {
     enabled: false,
-    master_ip: ['192.168.15.15'],
+    master_ip: ['192.168.1.15'],
   },
 
   // Domain suffix for the ingresses
-  suffixDomain: '192.168.15.15.nip.io',
+  suffixDomain: '192.168.1.15.nip.io',
+  // Additional domain suffixes for the ingresses.
+  // For example suffixDomain could be an external one and this a local domain.
+  additionalDomains: [],
   // If TLSingress is true, a self-signed HTTPS ingress with redirect will be created
   TLSingress: true,
   // If UseProvidedCerts is true, provided files will be used on created HTTPS ingresses.
@@ -52,14 +65,34 @@
   TLSCertificate: importstr 'server.crt',
   TLSKey: importstr 'server.key',
 
-  // Setting these to false, defaults to emptyDirs
+  // Persistent volume configuration
   enablePersistence: {
+    // Setting these to false, defaults to emptyDirs.
     prometheus: false,
     grafana: false,
+    // If using a pre-created PV, fill in the names below. If blank, they will use the default StorageClass
+    prometheusPV: '',
+    grafanaPV: '',
+    // If required to use a specific storageClass, keep the PV names above blank and fill the storageClass name below.
+    storageClass: '',
+    // Define the PV sizes below
+    prometheusSizePV: '2Gi',
+    grafanaSizePV: '20Gi',
   },
 
-  // Grafana "from" email
+  // Configuration for Prometheus deployment
+  prometheus: {
+    retention: '15d',
+    scrapeInterval: '30s',
+    scrapeTimeout: '30s',
+  },
   grafana: {
+    // Grafana "from" email
     from_address: 'myemail@gmail.com',
+    // Plugins to be installed at runtime.
+    //Ex. plugins: ['grafana-piechart-panel', 'grafana-clock-panel'],
+    plugins: [],
+    //Ex. env: [ { name: 'http_proxy', value: 'host:8080' } ]
+    env: []
   },
 }