diff --git a/.gitignore b/.gitignore index 0887fe6e14582649216565919bd2be60f93828aa..133fdf90df99129fd3912762ba7f6348c09f2d42 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ tmp/ minikube-manifests/ +jsonnetfile.lock.json +vendor/ diff --git a/Makefile b/Makefile index 90736d6169c92e9facfbd35c4231b55187d1d2aa..a7903cf8376ecc3bfaf66e58b327735222e1be23 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,9 @@ -.PHONY: image - image: docker build -f ../../scripts/jsonnet/Dockerfile -t po-jsonnet ../../ generate: image @echo ">> Compiling assets and generating Kubernetes manifests" - docker run --rm -u=$(shell id -u $(USER)):$(shell id -g $(USER)) -v `pwd`:/go/src/github.com/coreos/prometheus-operator/contrib/kube-prometheus --workdir /go/src/github.com/coreos/prometheus-operator/contrib/kube-prometheus po-jsonnet make generate-raw + docker run --rm -u=$(shell id -u $(USER)):$(shell id -g $(USER)) -v $(shell dirname $(dir $(abspath $(dir $$PWD)))):/go/src/github.com/coreos/prometheus-operator/ --workdir /go/src/github.com/coreos/prometheus-operator/contrib/kube-prometheus po-jsonnet make crdtojsonnet generate-raw crdtojsonnet: cat ../../example/prometheus-operator-crd/alertmanager.crd.yaml | gojsontoyaml -yamltojson > jsonnet/kube-prometheus/prometheus-operator/alertmanager-crd.libsonnet @@ -13,5 +11,7 @@ crdtojsonnet: cat ../../example/prometheus-operator-crd/servicemonitor.crd.yaml | gojsontoyaml -yamltojson > jsonnet/kube-prometheus/prometheus-operator/servicemonitor-crd.libsonnet generate-raw: - cd jsonnet/kube-prometheus; jb install - ./hack/scripts/build-jsonnet.sh hack/scripts/kube-prometheus-base.jsonnet manifests + jb install + ./build.sh + +.PHONY: image generate crdtojsonnet generate-raw diff --git a/README.md b/README.md index ac4497d27308f1de60b79b00f96cddfd0c485a0e..3d1d27f83cf8fa71a883db1b70b4f5af7659d35f 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ $ minikube delete && minikube start --kubernetes-version=v1.10.1 --memory=4096 - ## Quickstart -Although this project is intended to be used as a library, a compiled version of the Kubernetes manifests generated with this library is checked into this repository in order to try the content our quickly. +Although this project is intended to be used as a library, a compiled version of the Kubernetes manifests generated with this library is checked into this repository in order to try the content out quickly. Simply create the stack: @@ -55,46 +55,43 @@ $ jb install github.com/coreos/prometheus-operator/contrib/kube-prometheus/jsonn You may wish to not use ksonnet and simply render the generated manifests to files on disk, this can be done with: -[embedmd]:# (hack/scripts/kube-prometheus-base.jsonnet) +[embedmd]:# (example.jsonnet) ```jsonnet -local kp = (import "kube-prometheus/kube-prometheus.libsonnet") + { - _config+:: { - namespace: "monitoring", - } +local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + { + _config+:: { + namespace: 'monitoring', + }, }; -{["0prometheus-operator-"+name+".yaml"]: std.manifestYamlDoc(kp.prometheusOperator[name]) for name in std.objectFields(kp.prometheusOperator)} + -{["node-exporter-"+name+".yaml"]: std.manifestYamlDoc(kp.nodeExporter[name]) for name in std.objectFields(kp.nodeExporter)} + -{["kube-state-metrics-"+name+".yaml"]: std.manifestYamlDoc(kp.kubeStateMetrics[name]) for name in std.objectFields(kp.kubeStateMetrics)} + -{["alertmanager-"+name+".yaml"]: std.manifestYamlDoc(kp.alertmanager[name]) for name in std.objectFields(kp.alertmanager)} + -{["prometheus-"+name+".yaml"]: std.manifestYamlDoc(kp.prometheus[name]) for name in std.objectFields(kp.prometheus)} + -{["grafana-"+name+".yaml"]: std.manifestYamlDoc(kp.grafana[name]) for name in std.objectFields(kp.grafana)} +{ ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } + +{ ['0prometheus-operator-' + name]: kp.prometheusOperator[name] for name in std.objectFields(kp.prometheusOperator) } + +{ ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } + +{ ['kube-state-metrics-' + name]: kp.kubeStateMetrics[name] for name in std.objectFields(kp.kubeStateMetrics) } + +{ ['alertmanager-' + name]: kp.alertmanager[name] for name in std.objectFields(kp.alertmanager) } + +{ ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } + +{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } ``` -This renders all manifests in a json structure of `{filename: manifest-content}`. To split this into files on disk use: +This renders all manifests in a json structure of `{filename: manifest-content}`. -> Note you need `jsonnet`, `jq`, `sed`, `tr` and `gojsonyaml` (`go get github.com/brancz/gojsontoyaml`) installed. +### Compiling -```bash -jsonnet -J vendor example.jsonnet > tmp.json +To compile the above and get each manifest in a separate file on disk use the following script: -files=$(jq -r 'keys[]' tmp.json) +[embedmd]:# (build.sh) +```sh +#!/usr/bin/env bash +set -e +set -x -for file in ${files}; do - # prepare directory - dir=$(dirname "${file}") - path="${dir}" - mkdir -p ${path} + # optional, but we would like to generate yaml, not json +jsonnet -J vendor -m manifests example.jsonnet | xargs -I{} sh -c 'cat $1 | gojsontoyaml > $1.yaml; rm $1' -- {} - # covert file name to snake case with dashes - fullfile=$(echo ${file} | sed -r 's/([a-z0-9])([A-Z])/\1-\L\2/g' | tr '[:upper:]' '[:lower:]') +``` - # write each value to the path in key; convert multiple times to prettify yaml - jq -r ".[\"${file}\"]" tmp.json | gojsontoyaml -yamltojson | gojsontoyaml > "${fullfile}" -done +> Note you need `jsonnet` and `gojsonyaml` (`go get github.com/brancz/gojsontoyaml`) installed. If you just want json output, not yaml, then you can skip the pipe and everything afterwards. -rm tmp.json -``` +This script reads each key of the generated json and uses that as the file name, and writes the value of that key to that file. ## Configuration @@ -145,14 +142,28 @@ Jsonnet is a turing complete language, any logic can be reflected in it. It also A common example is that not all Kubernetes clusters are created exactly the same way, meaning the configuration to monitor them may be slightly different. For [kubeadm]() and [bootkube]() clusters there are mixins available to easily configure these: kubeadm: + [embedmd]:# (examples/kubeadm.jsonnet) +```jsonnet +(import "kube-prometheus/kube-prometheus.libsonnet") + +(import "kube-prometheus/kube-prometheus-kubeadm.libsonnet") +``` bootkube: + [embedmd]:# (examples/bootkube.jsonnet) +```jsonnet +(import "kube-prometheus/kube-prometheus.libsonnet") + +(import "kube-prometheus/kube-prometheus-bootkube.libsonnet") +``` Another mixin that may be useful for exploring the stack is to expose the UIs of Prometheus, Alertmanager and Grafana on NodePorts: [embedmd]:# (examples/node-ports.jsonnet) +```jsonnet +(import "kube-prometheus/kube-prometheus.libsonnet") + +(import "kube-prometheus/kube-prometheus-node-ports.libsonnet") +``` For example the name of the `Prometheus` object provided by this library can be overridden: @@ -179,7 +190,34 @@ local daemonset = k.apps.v1beta2.daemonSet; ((import "kube-prometheus/kube-prometheus.libsonnet") + { nodeExporter+: { daemonset+: - daemonset.mixin.metadata.withNamespace("my-custom-namespace") + + daemonset.mixin.metadata.withNamespace("my-custom-namespace") } }).nodeExporter.daemonset ``` + +## Example + +To use an easy to reproduce example, let's take the minikube setup as demonstrated in [prerequisites](#Prerequisites). It is a kubeadm cluster (as we use the kubeadm bootstrapper) and because we would like easy access to our Prometheus, Alertmanager and Grafana UI we want the services to be exposed as NodePort type services: + +> Note that NodePort type services is likely not a good idea for your production use case, it is only used for demonstration purposes here. + +[embedmd]:# (examples/minikube.jsonnet) +```jsonnet +local kp = + (import 'kube-prometheus/kube-prometheus.libsonnet') + + (import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet') + + (import 'kube-prometheus/kube-prometheus-node-ports.libsonnet') + + { + _config+:: { + namespace: 'monitoring', + }, + }; + +{ ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } + +{ ['0prometheus-operator-' + name]: kp.prometheusOperator[name] for name in std.objectFields(kp.prometheusOperator) } + +{ ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } + +{ ['kube-state-metrics-' + name]: kp.kubeStateMetrics[name] for name in std.objectFields(kp.kubeStateMetrics) } + +{ ['alertmanager-' + name]: kp.alertmanager[name] for name in std.objectFields(kp.alertmanager) } + +{ ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } + +{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } +``` diff --git a/build.sh b/build.sh new file mode 100755 index 0000000000000000000000000000000000000000..cefa57e89212f0dd0ecda0a0784c90d8c8a002bd --- /dev/null +++ b/build.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +set -e +set -x + + # optional, but we would like to generate yaml, not json +jsonnet -J vendor -m manifests example.jsonnet | xargs -I{} sh -c 'cat $1 | gojsontoyaml > $1.yaml; rm $1' -- {} + diff --git a/example.jsonnet b/example.jsonnet new file mode 100644 index 0000000000000000000000000000000000000000..1d36eb1fc147d094849c33069534e08085271b1c --- /dev/null +++ b/example.jsonnet @@ -0,0 +1,13 @@ +local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + { + _config+:: { + namespace: 'monitoring', + }, +}; + +{ ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } + +{ ['0prometheus-operator-' + name]: kp.prometheusOperator[name] for name in std.objectFields(kp.prometheusOperator) } + +{ ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } + +{ ['kube-state-metrics-' + name]: kp.kubeStateMetrics[name] for name in std.objectFields(kp.kubeStateMetrics) } + +{ ['alertmanager-' + name]: kp.alertmanager[name] for name in std.objectFields(kp.alertmanager) } + +{ ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } + +{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } diff --git a/examples/minikube.jsonnet b/examples/minikube.jsonnet new file mode 100644 index 0000000000000000000000000000000000000000..ed1a05c44d5683a348e4dfd464070f15feac25c2 --- /dev/null +++ b/examples/minikube.jsonnet @@ -0,0 +1,17 @@ +local kp = + (import 'kube-prometheus/kube-prometheus.libsonnet') + + (import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet') + + (import 'kube-prometheus/kube-prometheus-node-ports.libsonnet') + + { + _config+:: { + namespace: 'monitoring', + }, + }; + +{ ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } + +{ ['0prometheus-operator-' + name]: kp.prometheusOperator[name] for name in std.objectFields(kp.prometheusOperator) } + +{ ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } + +{ ['kube-state-metrics-' + name]: kp.kubeStateMetrics[name] for name in std.objectFields(kp.kubeStateMetrics) } + +{ ['alertmanager-' + name]: kp.alertmanager[name] for name in std.objectFields(kp.alertmanager) } + +{ ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } + +{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } diff --git a/hack/cluster-monitoring/deploy b/hack/cluster-monitoring/deploy deleted file mode 100755 index 6be94e01245dd4232a97c8b701719cfdfef71115..0000000000000000000000000000000000000000 --- a/hack/cluster-monitoring/deploy +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash -# exit immediately when a command fails -set -e -# only exit with zero if all commands of the pipeline exit successfully -set -o pipefail -# error on unset variables -set -u -# print each command before executing it -set -x - -manifest_prefix=${1-./manifests} - -kubectl create namespace monitoring - -find ${manifest_prefix}/prometheus-operator/ -type f ! -name service-monitor.yaml -exec kubectl apply -f {} \; - -# Wait for CRDs to be ready. -printf "Waiting for Operator to register custom resource definitions..." -until kubectl get customresourcedefinitions servicemonitors.monitoring.coreos.com > /dev/null 2>&1; do sleep 1; printf "."; done -until kubectl get customresourcedefinitions prometheuses.monitoring.coreos.com > /dev/null 2>&1; do sleep 1; printf "."; done -until kubectl get customresourcedefinitions alertmanagers.monitoring.coreos.com > /dev/null 2>&1; do sleep 1; printf "."; done -until kubectl get servicemonitors.monitoring.coreos.com > /dev/null 2>&1; do sleep 1; printf "."; done -until kubectl get prometheuses.monitoring.coreos.com > /dev/null 2>&1; do sleep 1; printf "."; done -until kubectl get alertmanagers.monitoring.coreos.com > /dev/null 2>&1; do sleep 1; printf "."; done -echo "done!" - -# need to ensure that ServiceMonitors are registered before we can create the prometheus-operator ServiceMonitor -kubectl apply -f ${manifest_prefix}/prometheus-operator/service-monitor.yaml - -kubectl apply -f ${manifest_prefix}/node-exporter/ -kubectl apply -f ${manifest_prefix}/kube-state-metrics/ -find ${manifest_prefix}/grafana/ -type f ! -name dashboard-definitions.yaml -exec kubectl apply -f {} \; - -# kubectl apply wants to put the previous version in an annotation, which is too large, therefore create instead of apply -kubectl create -f ${manifest_prefix}/grafana/dashboard-definitions.yaml -kubectl apply -f ${manifest_prefix}/prometheus/ -kubectl apply -f ${manifest_prefix}/alertmanager/ - diff --git a/hack/cluster-monitoring/teardown b/hack/cluster-monitoring/teardown deleted file mode 100755 index 0ef9a6b3d80e6ed7184694fc51fbc499e6609e10..0000000000000000000000000000000000000000 --- a/hack/cluster-monitoring/teardown +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -kubectl delete namespace monitoring - diff --git a/hack/scripts/build-jsonnet.sh b/hack/scripts/build-jsonnet.sh deleted file mode 100755 index 7a754e6c33a25dae6d1e5acf6f31fd24a183a049..0000000000000000000000000000000000000000 --- a/hack/scripts/build-jsonnet.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -set -e -set -x - -jsonnet="${1-kube-prometheus.jsonnet}" -prefix="${2-manifests}" -json="tmp/manifests.json" - -rm -rf ${prefix} -mkdir -p $(dirname "${json}") -jsonnet -J jsonnet/kube-prometheus/vendor -J jsonnet ${jsonnet} > ${json} - -files=$(jq -r 'keys[]' ${json}) - -for file in ${files}; do - dir=$(dirname "${file}") - path="${prefix}/${dir}" - mkdir -p ${path} - fullfile=$(echo ${file} | sed -r 's/([a-z0-9])([A-Z])/\1-\L\2/g' | tr '[:upper:]' '[:lower:]') - jq -r ".[\"${file}\"]" ${json} | gojsontoyaml -yamltojson | gojsontoyaml > "${prefix}/${fullfile}" -done diff --git a/hack/scripts/kube-prometheus-base.jsonnet b/hack/scripts/kube-prometheus-base.jsonnet deleted file mode 100644 index 84eb3c29e16037725db539afcaa22877e31d190c..0000000000000000000000000000000000000000 --- a/hack/scripts/kube-prometheus-base.jsonnet +++ /dev/null @@ -1,12 +0,0 @@ -local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + { - _config+:: { - namespace: 'monitoring', - }, -}; - -{ ['0prometheus-operator-' + name + '.yaml']: std.manifestYamlDoc(kp.prometheusOperator[name]) for name in std.objectFields(kp.prometheusOperator) } + -{ ['node-exporter-' + name + '.yaml']: std.manifestYamlDoc(kp.nodeExporter[name]) for name in std.objectFields(kp.nodeExporter) } + -{ ['kube-state-metrics-' + name + '.yaml']: std.manifestYamlDoc(kp.kubeStateMetrics[name]) for name in std.objectFields(kp.kubeStateMetrics) } + -{ ['alertmanager-' + name + '.yaml']: std.manifestYamlDoc(kp.alertmanager[name]) for name in std.objectFields(kp.alertmanager) } + -{ ['prometheus-' + name + '.yaml']: std.manifestYamlDoc(kp.prometheus[name]) for name in std.objectFields(kp.prometheus) } + -{ ['grafana-' + name + '.yaml']: std.manifestYamlDoc(kp.grafana[name]) for name in std.objectFields(kp.grafana) } diff --git a/hack/scripts/kube-prometheus-minikube.jsonnet b/hack/scripts/kube-prometheus-minikube.jsonnet deleted file mode 100644 index 9a6fff17d36c02b2a7d7cf63056d00c3b40db602..0000000000000000000000000000000000000000 --- a/hack/scripts/kube-prometheus-minikube.jsonnet +++ /dev/null @@ -1,16 +0,0 @@ -local kp = - (import 'kube-prometheus/kube-prometheus.libsonnet') + - (import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet') + - (import 'kube-prometheus/kube-prometheus-node-ports.libsonnet') + - { - _config+:: { - namespace: 'monitoring', - }, - }; - -{ ['0prometheus-operator-' + name + '.yaml']: std.manifestYamlDoc(kp.prometheusOperator[name]) for name in std.objectFields(kp.prometheusOperator) } + -{ ['node-exporter-' + name + '.yaml']: std.manifestYamlDoc(kp.nodeExporter[name]) for name in std.objectFields(kp.nodeExporter) } + -{ ['kube-state-metrics-' + name + '.yaml']: std.manifestYamlDoc(kp.kubeStateMetrics[name]) for name in std.objectFields(kp.kubeStateMetrics) } + -{ ['alertmanager-' + name + '.yaml']: std.manifestYamlDoc(kp.alertmanager[name]) for name in std.objectFields(kp.alertmanager) } + -{ ['prometheus-' + name + '.yaml']: std.manifestYamlDoc(kp.prometheus[name]) for name in std.objectFields(kp.prometheus) } + -{ ['grafana-' + name + '.yaml']: std.manifestYamlDoc(kp.grafana[name]) for name in std.objectFields(kp.grafana) } diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index 36eae76d5dc6cbfa09c07c976726180ddc0979ce..e79b75676b49ad6709eb66c8b9a13796d2bbd372 100644 --- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet @@ -6,9 +6,14 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; (import 'alertmanager/alertmanager.libsonnet') + (import 'prometheus-operator/prometheus-operator.libsonnet') + (import 'prometheus/prometheus.libsonnet') + -(import 'kubernetes-mixin/mixin.libsonnet') + -{ +(import 'kubernetes-mixin/mixin.libsonnet') + { + kubePrometheus+:: { + namespace: k.core.v1.namespace.new($._config.namespace), + }, +} + { _config+:: { + namespace: 'default', + kubeStateMetricsSelector: 'job="kube-state-metrics"', cadvisorSelector: 'job="kubelet"', nodeExporterSelector: 'job="node-exporter"', diff --git a/jsonnetfile.json b/jsonnetfile.json new file mode 100644 index 0000000000000000000000000000000000000000..b4ebb0f2d8395fb3455d878435a9e3ef059bc496 --- /dev/null +++ b/jsonnetfile.json @@ -0,0 +1,14 @@ +{ + "dependencies": [ + { + "name": "kube-prometheus", + "source": { + "git": { + "remote": "../../", + "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus" + } + }, + "version": "." + } + ] +} \ No newline at end of file diff --git a/manifests/00namespace-namespace.yaml b/manifests/00namespace-namespace.yaml new file mode 100644 index 0000000000000000000000000000000000000000..d32523606f28187cc65fbb56387a78011a1e9425 --- /dev/null +++ b/manifests/00namespace-namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: monitoring diff --git a/manifests/0prometheus-operator-0alertmanager-custom-resource-definition.yaml b/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml similarity index 100% rename from manifests/0prometheus-operator-0alertmanager-custom-resource-definition.yaml rename to manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml diff --git a/manifests/0prometheus-operator-0prometheus-custom-resource-definition.yaml b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml similarity index 100% rename from manifests/0prometheus-operator-0prometheus-custom-resource-definition.yaml rename to manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml diff --git a/manifests/0prometheus-operator-0servicemonitor-custom-resource-definition.yaml b/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml similarity index 100% rename from manifests/0prometheus-operator-0servicemonitor-custom-resource-definition.yaml rename to manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml diff --git a/manifests/0prometheus-operator-cluster-role.yaml b/manifests/0prometheus-operator-clusterRole.yaml similarity index 100% rename from manifests/0prometheus-operator-cluster-role.yaml rename to manifests/0prometheus-operator-clusterRole.yaml diff --git a/manifests/0prometheus-operator-cluster-role-binding.yaml b/manifests/0prometheus-operator-clusterRoleBinding.yaml similarity index 100% rename from manifests/0prometheus-operator-cluster-role-binding.yaml rename to manifests/0prometheus-operator-clusterRoleBinding.yaml diff --git a/manifests/0prometheus-operator-service-account.yaml b/manifests/0prometheus-operator-serviceAccount.yaml similarity index 100% rename from manifests/0prometheus-operator-service-account.yaml rename to manifests/0prometheus-operator-serviceAccount.yaml diff --git a/manifests/alertmanager-service-account.yaml b/manifests/alertmanager-serviceAccount.yaml similarity index 100% rename from manifests/alertmanager-service-account.yaml rename to manifests/alertmanager-serviceAccount.yaml diff --git a/manifests/alertmanager-service-monitor.yaml b/manifests/alertmanager-serviceMonitor.yaml similarity index 100% rename from manifests/alertmanager-service-monitor.yaml rename to manifests/alertmanager-serviceMonitor.yaml diff --git a/manifests/grafana-dashboard-datasources.yaml b/manifests/grafana-dashboardDatasources.yaml similarity index 100% rename from manifests/grafana-dashboard-datasources.yaml rename to manifests/grafana-dashboardDatasources.yaml diff --git a/manifests/grafana-dashboard-definitions.yaml b/manifests/grafana-dashboardDefinitions.yaml similarity index 100% rename from manifests/grafana-dashboard-definitions.yaml rename to manifests/grafana-dashboardDefinitions.yaml diff --git a/manifests/grafana-dashboard-sources.yaml b/manifests/grafana-dashboardSources.yaml similarity index 100% rename from manifests/grafana-dashboard-sources.yaml rename to manifests/grafana-dashboardSources.yaml diff --git a/manifests/grafana-service-account.yaml b/manifests/grafana-serviceAccount.yaml similarity index 100% rename from manifests/grafana-service-account.yaml rename to manifests/grafana-serviceAccount.yaml diff --git a/manifests/kube-state-metrics-cluster-role.yaml b/manifests/kube-state-metrics-clusterRole.yaml similarity index 100% rename from manifests/kube-state-metrics-cluster-role.yaml rename to manifests/kube-state-metrics-clusterRole.yaml diff --git a/manifests/kube-state-metrics-cluster-role-binding.yaml b/manifests/kube-state-metrics-clusterRoleBinding.yaml similarity index 100% rename from manifests/kube-state-metrics-cluster-role-binding.yaml rename to manifests/kube-state-metrics-clusterRoleBinding.yaml diff --git a/manifests/kube-state-metrics-role-binding.yaml b/manifests/kube-state-metrics-roleBinding.yaml similarity index 100% rename from manifests/kube-state-metrics-role-binding.yaml rename to manifests/kube-state-metrics-roleBinding.yaml diff --git a/manifests/kube-state-metrics-service-account.yaml b/manifests/kube-state-metrics-serviceAccount.yaml similarity index 100% rename from manifests/kube-state-metrics-service-account.yaml rename to manifests/kube-state-metrics-serviceAccount.yaml diff --git a/manifests/kube-state-metrics-service-monitor.yaml b/manifests/kube-state-metrics-serviceMonitor.yaml similarity index 100% rename from manifests/kube-state-metrics-service-monitor.yaml rename to manifests/kube-state-metrics-serviceMonitor.yaml diff --git a/manifests/node-exporter-cluster-role.yaml b/manifests/node-exporter-clusterRole.yaml similarity index 100% rename from manifests/node-exporter-cluster-role.yaml rename to manifests/node-exporter-clusterRole.yaml diff --git a/manifests/node-exporter-cluster-role-binding.yaml b/manifests/node-exporter-clusterRoleBinding.yaml similarity index 100% rename from manifests/node-exporter-cluster-role-binding.yaml rename to manifests/node-exporter-clusterRoleBinding.yaml diff --git a/manifests/node-exporter-service-account.yaml b/manifests/node-exporter-serviceAccount.yaml similarity index 100% rename from manifests/node-exporter-service-account.yaml rename to manifests/node-exporter-serviceAccount.yaml diff --git a/manifests/node-exporter-service-monitor.yaml b/manifests/node-exporter-serviceMonitor.yaml similarity index 100% rename from manifests/node-exporter-service-monitor.yaml rename to manifests/node-exporter-serviceMonitor.yaml diff --git a/manifests/prometheus-cluster-role.yaml b/manifests/prometheus-clusterRole.yaml similarity index 100% rename from manifests/prometheus-cluster-role.yaml rename to manifests/prometheus-clusterRole.yaml diff --git a/manifests/prometheus-cluster-role-binding.yaml b/manifests/prometheus-clusterRoleBinding.yaml similarity index 100% rename from manifests/prometheus-cluster-role-binding.yaml rename to manifests/prometheus-clusterRoleBinding.yaml diff --git a/manifests/prometheus-role-binding-config.yaml b/manifests/prometheus-roleBindingConfig.yaml similarity index 100% rename from manifests/prometheus-role-binding-config.yaml rename to manifests/prometheus-roleBindingConfig.yaml diff --git a/manifests/prometheus-role-binding-default.yaml b/manifests/prometheus-roleBindingDefault.yaml similarity index 100% rename from manifests/prometheus-role-binding-default.yaml rename to manifests/prometheus-roleBindingDefault.yaml diff --git a/manifests/prometheus-role-binding-kube-system.yaml b/manifests/prometheus-roleBindingKubeSystem.yaml similarity index 100% rename from manifests/prometheus-role-binding-kube-system.yaml rename to manifests/prometheus-roleBindingKubeSystem.yaml diff --git a/manifests/prometheus-role-binding-namespace.yaml b/manifests/prometheus-roleBindingNamespace.yaml similarity index 100% rename from manifests/prometheus-role-binding-namespace.yaml rename to manifests/prometheus-roleBindingNamespace.yaml diff --git a/manifests/prometheus-role-config.yaml b/manifests/prometheus-roleConfig.yaml similarity index 100% rename from manifests/prometheus-role-config.yaml rename to manifests/prometheus-roleConfig.yaml diff --git a/manifests/prometheus-role-default.yaml b/manifests/prometheus-roleDefault.yaml similarity index 100% rename from manifests/prometheus-role-default.yaml rename to manifests/prometheus-roleDefault.yaml diff --git a/manifests/prometheus-role-kube-system.yaml b/manifests/prometheus-roleKubeSystem.yaml similarity index 100% rename from manifests/prometheus-role-kube-system.yaml rename to manifests/prometheus-roleKubeSystem.yaml diff --git a/manifests/prometheus-role-namespace.yaml b/manifests/prometheus-roleNamespace.yaml similarity index 100% rename from manifests/prometheus-role-namespace.yaml rename to manifests/prometheus-roleNamespace.yaml diff --git a/manifests/prometheus-service-account.yaml b/manifests/prometheus-serviceAccount.yaml similarity index 100% rename from manifests/prometheus-service-account.yaml rename to manifests/prometheus-serviceAccount.yaml diff --git a/manifests/prometheus-service-monitor-apiserver.yaml b/manifests/prometheus-serviceMonitorApiserver.yaml similarity index 100% rename from manifests/prometheus-service-monitor-apiserver.yaml rename to manifests/prometheus-serviceMonitorApiserver.yaml diff --git a/manifests/prometheus-service-monitor-core-dns.yaml b/manifests/prometheus-serviceMonitorCoreDNS.yaml similarity index 100% rename from manifests/prometheus-service-monitor-core-dns.yaml rename to manifests/prometheus-serviceMonitorCoreDNS.yaml diff --git a/manifests/prometheus-service-monitor-kube-controller-manager.yaml b/manifests/prometheus-serviceMonitorKubeControllerManager.yaml similarity index 100% rename from manifests/prometheus-service-monitor-kube-controller-manager.yaml rename to manifests/prometheus-serviceMonitorKubeControllerManager.yaml diff --git a/manifests/prometheus-service-monitor-kube-scheduler.yaml b/manifests/prometheus-serviceMonitorKubeScheduler.yaml similarity index 100% rename from manifests/prometheus-service-monitor-kube-scheduler.yaml rename to manifests/prometheus-serviceMonitorKubeScheduler.yaml diff --git a/manifests/prometheus-service-monitor-kubelet.yaml b/manifests/prometheus-serviceMonitorKubelet.yaml similarity index 100% rename from manifests/prometheus-service-monitor-kubelet.yaml rename to manifests/prometheus-serviceMonitorKubelet.yaml diff --git a/manifests/prometheus-service-monitor-prometheus.yaml b/manifests/prometheus-serviceMonitorPrometheus.yaml similarity index 100% rename from manifests/prometheus-service-monitor-prometheus.yaml rename to manifests/prometheus-serviceMonitorPrometheus.yaml diff --git a/manifests/prometheus-service-monitor-prometheus-operator.yaml b/manifests/prometheus-serviceMonitorPrometheusOperator.yaml similarity index 100% rename from manifests/prometheus-service-monitor-prometheus-operator.yaml rename to manifests/prometheus-serviceMonitorPrometheusOperator.yaml