diff --git a/Makefile b/Makefile index 6b3651ae9f1579665146b8a73ce1e3c94c9afe43..88bf25474a6cfed4efb46db662973893894a5073 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ generate: manifests **.md manifests: vendor example.jsonnet build.sh rm -rf manifests - ./build.sh + ./build.sh ./examples/kustomize.jsonnet vendor: $(JB_BINARY) jsonnetfile.json jsonnetfile.lock.json rm -rf vendor diff --git a/README.md b/README.md index bc320b7922796890dfd17d9f4b1ab09bfbed2e5d..115fbbbfcddc4083ad02facc452d21c6a4c009b7 100644 --- a/README.md +++ b/README.md @@ -165,6 +165,7 @@ local kp = { ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } + { ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } + { ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } + ``` And here's the [build.sh](build.sh) script (which uses `vendor/` to render all manifests in a json structure of `{filename: manifest-content}`): diff --git a/docs/developing-prometheus-rules-and-grafana-dashboards.md b/docs/developing-prometheus-rules-and-grafana-dashboards.md index 671a898706d77b46f57be05788ee3b3c9167ec38..17838b829b44200af1d555523934eeba44260b05 100644 --- a/docs/developing-prometheus-rules-and-grafana-dashboards.md +++ b/docs/developing-prometheus-rules-and-grafana-dashboards.md @@ -25,6 +25,7 @@ local kp = { ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } + { ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } + { ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } + ``` ## Prometheus rules diff --git a/example.jsonnet b/example.jsonnet index fcd2bb01cf3250b2ac1d2b256814b4a189424abc..c446eac140558b7a2c1aaaef05e3c1a8f2467faa 100644 --- a/example.jsonnet +++ b/example.jsonnet @@ -13,3 +13,4 @@ local kp = { ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } + { ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } + { ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } + diff --git a/examples/kustomize.jsonnet b/examples/kustomize.jsonnet new file mode 100644 index 0000000000000000000000000000000000000000..1b6b903865e34044e0beeca678b236e6231670af --- /dev/null +++ b/examples/kustomize.jsonnet @@ -0,0 +1,28 @@ +local kp = + (import 'kube-prometheus/kube-prometheus.libsonnet') + { + _config+:: { + namespace: 'monitoring', + }, + }; + +local manifests = + { ['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) } + + { ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } + + { ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) }; + +local kustomizationResourceFile(name) = './manifests/' + name + '.yaml'; +local kustomization = { + apiVersion: 'kustomize.config.k8s.io/v1beta1', + kind: 'Kustomization', + resources: std.map(kustomizationResourceFile, std.objectFields(manifests)), +}; + +manifests { + '../kustomization': kustomization, +} + diff --git a/kustomization.yaml b/kustomization.yaml new file mode 100644 index 0000000000000000000000000000000000000000..fc91b965e71d7c4eca1f4696ee67fdfa3e024693 --- /dev/null +++ b/kustomization.yaml @@ -0,0 +1,66 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ./manifests/00namespace-namespace.yaml +- ./manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml +- ./manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml +- ./manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml +- ./manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml +- ./manifests/0prometheus-operator-clusterRole.yaml +- ./manifests/0prometheus-operator-clusterRoleBinding.yaml +- ./manifests/0prometheus-operator-deployment.yaml +- ./manifests/0prometheus-operator-service.yaml +- ./manifests/0prometheus-operator-serviceAccount.yaml +- ./manifests/0prometheus-operator-serviceMonitor.yaml +- ./manifests/alertmanager-alertmanager.yaml +- ./manifests/alertmanager-secret.yaml +- ./manifests/alertmanager-service.yaml +- ./manifests/alertmanager-serviceAccount.yaml +- ./manifests/alertmanager-serviceMonitor.yaml +- ./manifests/grafana-dashboardDatasources.yaml +- ./manifests/grafana-dashboardDefinitions.yaml +- ./manifests/grafana-dashboardSources.yaml +- ./manifests/grafana-deployment.yaml +- ./manifests/grafana-service.yaml +- ./manifests/grafana-serviceAccount.yaml +- ./manifests/grafana-serviceMonitor.yaml +- ./manifests/kube-state-metrics-clusterRole.yaml +- ./manifests/kube-state-metrics-clusterRoleBinding.yaml +- ./manifests/kube-state-metrics-deployment.yaml +- ./manifests/kube-state-metrics-role.yaml +- ./manifests/kube-state-metrics-roleBinding.yaml +- ./manifests/kube-state-metrics-service.yaml +- ./manifests/kube-state-metrics-serviceAccount.yaml +- ./manifests/kube-state-metrics-serviceMonitor.yaml +- ./manifests/node-exporter-clusterRole.yaml +- ./manifests/node-exporter-clusterRoleBinding.yaml +- ./manifests/node-exporter-daemonset.yaml +- ./manifests/node-exporter-service.yaml +- ./manifests/node-exporter-serviceAccount.yaml +- ./manifests/node-exporter-serviceMonitor.yaml +- ./manifests/prometheus-adapter-apiService.yaml +- ./manifests/prometheus-adapter-clusterRole.yaml +- ./manifests/prometheus-adapter-clusterRoleBinding.yaml +- ./manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml +- ./manifests/prometheus-adapter-clusterRoleServerResources.yaml +- ./manifests/prometheus-adapter-configMap.yaml +- ./manifests/prometheus-adapter-deployment.yaml +- ./manifests/prometheus-adapter-roleBindingAuthReader.yaml +- ./manifests/prometheus-adapter-service.yaml +- ./manifests/prometheus-adapter-serviceAccount.yaml +- ./manifests/prometheus-clusterRole.yaml +- ./manifests/prometheus-clusterRoleBinding.yaml +- ./manifests/prometheus-prometheus.yaml +- ./manifests/prometheus-roleBindingConfig.yaml +- ./manifests/prometheus-roleBindingSpecificNamespaces.yaml +- ./manifests/prometheus-roleConfig.yaml +- ./manifests/prometheus-roleSpecificNamespaces.yaml +- ./manifests/prometheus-rules.yaml +- ./manifests/prometheus-service.yaml +- ./manifests/prometheus-serviceAccount.yaml +- ./manifests/prometheus-serviceMonitor.yaml +- ./manifests/prometheus-serviceMonitorApiserver.yaml +- ./manifests/prometheus-serviceMonitorCoreDNS.yaml +- ./manifests/prometheus-serviceMonitorKubeControllerManager.yaml +- ./manifests/prometheus-serviceMonitorKubeScheduler.yaml +- ./manifests/prometheus-serviceMonitorKubelet.yaml