RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 05:00:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
2226e0c942
ceph/monitoring/ceph-mixin/Makefile

26 lines
397 B
Makefile
Raw Normal View History

mgr/dashboard: monitoring: refactor into ceph-mixin Mixin is a way to bundle dashboards, prometheus rules and alerts into jsonnet package. Shifting to mixin will allow easier integration with monitoring automation that some users may use. This commit moves `/monitoring/grafana/dashboards` and `/monitoring/prometheus` to `/monitoring/ceph-mixin`. Prometheus alerts was also converted to Jsonnet using an automated way (from yaml to json to jsonnet). This commit minimises any change made to the generated files and should not change neithers the dashboards nor the Prometheus alerts. In the future some configuration will also be added to jsonnet to add more functionalities to the dashboards or alerts (i.e.: multi cluster). Fixes: https://tracker.ceph.com/issues/53374 Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
2021-11-23 08:30:38 +00:00
all: fmt generate lint test
fmt:
./lint-jsonnet.sh -i
generate: dashboards_out
ceph-mixin: fix ceph-mixin setup Made following changes to files, Makefile: Add needed 'tox' target to generate alert files Now we can do 'make generate' OR 'make test' to generate all the yaml files (and run tests) alerts.jsonnet: Added an 'import' line to include 'config.libsonnet' file. This fix the errors in generating 'prometheus_alerts.yml' file tox.ini: Added all the existing 'alerts-' targets to 'envlist' Added the missing 'alerts-test' target to 'testenv' Added 'jsonnet' to 'allowlist_externals', which prevents a deprecation waring A minor spell correction lint-jsonnet.sh: Made errors more verbose. Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>
2023-04-02 02:28:16 +00:00
tox -ealerts-fix
mgr/dashboard: monitoring: refactor into ceph-mixin Mixin is a way to bundle dashboards, prometheus rules and alerts into jsonnet package. Shifting to mixin will allow easier integration with monitoring automation that some users may use. This commit moves `/monitoring/grafana/dashboards` and `/monitoring/prometheus` to `/monitoring/ceph-mixin`. Prometheus alerts was also converted to Jsonnet using an automated way (from yaml to json to jsonnet). This commit minimises any change made to the generated files and should not change neithers the dashboards nor the Prometheus alerts. In the future some configuration will also be added to jsonnet to add more functionalities to the dashboards or alerts (i.e.: multi cluster). Fixes: https://tracker.ceph.com/issues/53374 Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
2021-11-23 08:30:38 +00:00
vendor: jsonnetfile.lock.json
tox -ejsonnet-bundler-install
ceph-mixin: fix makefile dashboards dependency Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
2022-05-12 15:23:56 +00:00
dashboards_out: vendor dashboards
mgr/dashboard: monitoring: refactor into ceph-mixin Mixin is a way to bundle dashboards, prometheus rules and alerts into jsonnet package. Shifting to mixin will allow easier integration with monitoring automation that some users may use. This commit moves `/monitoring/grafana/dashboards` and `/monitoring/prometheus` to `/monitoring/ceph-mixin`. Prometheus alerts was also converted to Jsonnet using an automated way (from yaml to json to jsonnet). This commit minimises any change made to the generated files and should not change neithers the dashboards nor the Prometheus alerts. In the future some configuration will also be added to jsonnet to add more functionalities to the dashboards or alerts (i.e.: multi cluster). Fixes: https://tracker.ceph.com/issues/53374 Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
2021-11-23 08:30:38 +00:00
tox -ejsonnet-fix
lint:
tox -ejsonnet-lint
tox -ealerts-lint
test: generate
tox -ejsonnet-check
tox -epromql-query-test
ceph-mixin: fix ceph-mixin setup Made following changes to files, Makefile: Add needed 'tox' target to generate alert files Now we can do 'make generate' OR 'make test' to generate all the yaml files (and run tests) alerts.jsonnet: Added an 'import' line to include 'config.libsonnet' file. This fix the errors in generating 'prometheus_alerts.yml' file tox.ini: Added all the existing 'alerts-' targets to 'envlist' Added the missing 'alerts-test' target to 'testenv' Added 'jsonnet' to 'allowlist_externals', which prevents a deprecation waring A minor spell correction lint-jsonnet.sh: Made errors more verbose. Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>
2023-04-02 02:28:16 +00:00
tox -ealerts-test
mgr/dashboard: monitoring: refactor into ceph-mixin Mixin is a way to bundle dashboards, prometheus rules and alerts into jsonnet package. Shifting to mixin will allow easier integration with monitoring automation that some users may use. This commit moves `/monitoring/grafana/dashboards` and `/monitoring/prometheus` to `/monitoring/ceph-mixin`. Prometheus alerts was also converted to Jsonnet using an automated way (from yaml to json to jsonnet). This commit minimises any change made to the generated files and should not change neithers the dashboards nor the Prometheus alerts. In the future some configuration will also be added to jsonnet to add more functionalities to the dashboards or alerts (i.e.: multi cluster). Fixes: https://tracker.ceph.com/issues/53374 Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
2021-11-23 08:30:38 +00:00
check: test
.PHONY: all fmt generate lint test check
Reference in New Issue Copy Permalink