diff --git a/Documentation/data-collection.md b/Documentation/data-collection.md index 64c311eee9..c45311c490 100644 --- a/Documentation/data-collection.md +++ b/Documentation/data-collection.md @@ -4,7 +4,7 @@ Red Hat values our customers' experience and privacy. It is important to us that OpenShift 4 clusters send anonymized telemetry back to Red Hat about the following attributes. The telemetry is gathered by referencing your cluster ID and pull secret: -[embedmd]:# (../manifests/0000_50_cluster_monitoring_operator_04-config.yaml) +[embedmd]:# (../manifests/0000_50_cluster-monitoring-operator_04-config.yaml) ```yaml apiVersion: v1 data: diff --git a/Makefile b/Makefile index 1fb4453b44..4d1a6183e8 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ vendor: go mod verify .PHONY: generate -generate: pkg/manifests/bindata.go manifests/0000_50_cluster_monitoring_operator_02-role.yaml docs +generate: pkg/manifests/bindata.go manifests/0000_50_cluster-monitoring-operator_02-role.yaml docs .PHONY: generate-in-docker generate-in-docker: @@ -102,14 +102,14 @@ pkg/manifests/bindata.go: $(GOBINDATA_BIN) $(ASSETS) $(GOBINDATA_BIN) -mode 420 -modtime 1 -pkg manifests -o $@ assets/... # Merge cluster roles -manifests/0000_50_cluster_monitoring_operator_02-role.yaml: hack/merge_cluster_roles.py hack/cluster-monitoring-operator-role.yaml.in $(ASSETS) +manifests/0000_50_cluster-monitoring-operator_02-role.yaml: hack/merge_cluster_roles.py hack/cluster-monitoring-operator-role.yaml.in $(ASSETS) python2 hack/merge_cluster_roles.py hack/cluster-monitoring-operator-role.yaml.in `find assets | grep role | grep -v "role-binding" | sort` > $@ .PHONY: docs docs: $(EMBEDMD_BIN) Documentation/telemeter_query $(EMBEDMD_BIN) -w `find Documentation -name "*.md"` -Documentation/telemeter_query: manifests/0000_50_cluster_monitoring_operator_04-config.yaml hack/telemeter_query.go +Documentation/telemeter_query: manifests/0000_50_cluster-monitoring-operator_04-config.yaml hack/telemeter_query.go go generate ./hack/telemeter_query.go > Documentation/telemeter_query ############## diff --git a/README.md b/README.md index 8d58de6bd7..ae8783133b 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Metrics are collected from the following components: ## Adding new metrics to be sent via telemetry -To add new metrics to be sent via telemetry, simply add a selector that matches the time-series to be sent in [manifests/0000_50_cluster_monitoring_operator_04-config.yaml](manifests/0000_50_cluster_monitoring_operator_04-config.yaml). +To add new metrics to be sent via telemetry, simply add a selector that matches the time-series to be sent in [manifests/0000_50_cluster-monitoring-operator_04-config.yaml](manifests/0000_50_cluster-monitoring-operator_04-config.yaml). Documentation on the data sent can be found in the [data collection documentation](Documentation/data-collection.md). diff --git a/hack/build-jsonnet.sh b/hack/build-jsonnet.sh index 052444473d..e4df51fbbe 100755 --- a/hack/build-jsonnet.sh +++ b/hack/build-jsonnet.sh @@ -33,9 +33,9 @@ done # shellcheck disable=SC1003 # Produce dashboard definitions in format understandable by CVO (it doesn't accept ConfigMapList) -grep -E -v '^apiVersion: v1|^items:|^kind: ConfigMapList' "${prefix}/grafana/console-dashboard-definitions.yaml" | sed 's/^\ \ //g;s/- apiVersion: v1/---\'$'\n''apiVersion: v1/g' > "manifests/0000_90_cluster_monitoring_operator_01-dashboards.yaml" +grep -E -v '^apiVersion: v1|^items:|^kind: ConfigMapList' "${prefix}/grafana/console-dashboard-definitions.yaml" | sed 's/^\ \ //g;s/- apiVersion: v1/---\'$'\n''apiVersion: v1/g' > "manifests/0000_90_cluster-monitoring-operator_01-dashboards.yaml" rm -f "${prefix}/grafana/console-dashboard-definitions.yaml" grep -H 'kind: CustomResourceDefinition' assets/prometheus-operator/* | cut -d: -f1 | while IFS= read -r f; do - mv "$f" "manifests/0000_50_cluster_monitoring_operator_00_$(basename "$f")" + mv "$f" "manifests/0000_50_cluster-monitoring-operator_00_$(basename "$f")" done diff --git a/hack/local-cmo.sh b/hack/local-cmo.sh index ebad34a2e9..3710510206 100755 --- a/hack/local-cmo.sh +++ b/hack/local-cmo.sh @@ -22,7 +22,7 @@ kubectl patch clusterversion/version --type=json -p="[{\"op\": \"add\", \"path\" kubectl -n openshift-monitoring scale --replicas=0 deployment/cluster-monitoring-operator # shellcheck disable=SC2002 -cat manifests/0000_50_cluster_monitoring_operator_04-config.yaml | gojsontoyaml -yamltojson | jq -r '.data["metrics.yaml"]' > /tmp/telemetry-config.yaml +cat manifests/0000_50_cluster-monitoring-operator_04-config.yaml | gojsontoyaml -yamltojson | jq -r '.data["metrics.yaml"]' > /tmp/telemetry-config.yaml # shellcheck disable=SC2086 ./operator ${IMAGES} -telemetry-config /tmp/telemetry-config.yaml -kubeconfig "${KUBECONFIG}" -namespace=openshift-monitoring -configmap=cluster-monitoring-config -logtostderr=true -v=4 2>&1 | tee operator.log diff --git a/hack/telemeter_query.go b/hack/telemeter_query.go index 51838b1938..e63151fb12 100644 --- a/hack/telemeter_query.go +++ b/hack/telemeter_query.go @@ -65,4 +65,4 @@ func main() { fmt.Println(s) } -//go:generate go run -mod=vendor telemeter_query.go ../manifests/0000_50_cluster_monitoring_operator_04-config.yaml +//go:generate go run -mod=vendor telemeter_query.go ../manifests/0000_50_cluster-monitoring-operator_04-config.yaml diff --git a/manifests/0000_50_cluster_monitoring_operator_00_0alertmanager-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml similarity index 100% rename from manifests/0000_50_cluster_monitoring_operator_00_0alertmanager-custom-resource-definition.yaml rename to manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml diff --git a/manifests/0000_50_cluster_monitoring_operator_00_0podmonitor-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml similarity index 100% rename from manifests/0000_50_cluster_monitoring_operator_00_0podmonitor-custom-resource-definition.yaml rename to manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml diff --git a/manifests/0000_50_cluster_monitoring_operator_00_0prometheus-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml similarity index 100% rename from manifests/0000_50_cluster_monitoring_operator_00_0prometheus-custom-resource-definition.yaml rename to manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml diff --git a/manifests/0000_50_cluster_monitoring_operator_00_0prometheusrule-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml similarity index 100% rename from manifests/0000_50_cluster_monitoring_operator_00_0prometheusrule-custom-resource-definition.yaml rename to manifests/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml diff --git a/manifests/0000_50_cluster_monitoring_operator_00_0servicemonitor-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml similarity index 100% rename from manifests/0000_50_cluster_monitoring_operator_00_0servicemonitor-custom-resource-definition.yaml rename to manifests/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml diff --git a/manifests/0000_50_cluster_monitoring_operator_00_0thanosruler-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml similarity index 100% rename from manifests/0000_50_cluster_monitoring_operator_00_0thanosruler-custom-resource-definition.yaml rename to manifests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml diff --git a/manifests/0000_50_cluster_monitoring_operator_01-namespace.yaml b/manifests/0000_50_cluster-monitoring-operator_01-namespace.yaml similarity index 100% rename from manifests/0000_50_cluster_monitoring_operator_01-namespace.yaml rename to manifests/0000_50_cluster-monitoring-operator_01-namespace.yaml diff --git a/manifests/0000_50_cluster_monitoring_operator_02-role.yaml b/manifests/0000_50_cluster-monitoring-operator_02-role.yaml similarity index 100% rename from manifests/0000_50_cluster_monitoring_operator_02-role.yaml rename to manifests/0000_50_cluster-monitoring-operator_02-role.yaml diff --git a/manifests/0000_50_cluster_monitoring_operator_03-role-binding.yaml b/manifests/0000_50_cluster-monitoring-operator_03-role-binding.yaml similarity index 100% rename from manifests/0000_50_cluster_monitoring_operator_03-role-binding.yaml rename to manifests/0000_50_cluster-monitoring-operator_03-role-binding.yaml diff --git a/manifests/0000_50_cluster_monitoring_operator_04-config.yaml b/manifests/0000_50_cluster-monitoring-operator_04-config.yaml similarity index 100% rename from manifests/0000_50_cluster_monitoring_operator_04-config.yaml rename to manifests/0000_50_cluster-monitoring-operator_04-config.yaml diff --git a/manifests/0000_50_cluster_monitoring_operator_05-deployment.yaml b/manifests/0000_50_cluster-monitoring-operator_05-deployment.yaml similarity index 100% rename from manifests/0000_50_cluster_monitoring_operator_05-deployment.yaml rename to manifests/0000_50_cluster-monitoring-operator_05-deployment.yaml diff --git a/manifests/0000_50_cluster_monitoring_operator_06-clusteroperator.yaml b/manifests/0000_50_cluster-monitoring-operator_06-clusteroperator.yaml similarity index 100% rename from manifests/0000_50_cluster_monitoring_operator_06-clusteroperator.yaml rename to manifests/0000_50_cluster-monitoring-operator_06-clusteroperator.yaml diff --git a/manifests/0000_90_cluster_monitoring_operator_00-operatorgroup.yaml b/manifests/0000_90_cluster-monitoring-operator_00-operatorgroup.yaml similarity index 100% rename from manifests/0000_90_cluster_monitoring_operator_00-operatorgroup.yaml rename to manifests/0000_90_cluster-monitoring-operator_00-operatorgroup.yaml diff --git a/manifests/0000_90_cluster_monitoring_operator_01-dashboards.yaml b/manifests/0000_90_cluster-monitoring-operator_01-dashboards.yaml similarity index 100% rename from manifests/0000_90_cluster_monitoring_operator_01-dashboards.yaml rename to manifests/0000_90_cluster-monitoring-operator_01-dashboards.yaml