diff --git a/docs/data-collection.md b/docs/data-collection.md index 7b0ad12e5..8275f887e 100644 --- a/docs/data-collection.md +++ b/docs/data-collection.md @@ -125,6 +125,8 @@ For the OpenShift 4 Developer Preview we will be sending back these exact attrib '{__name__="noobaa_accounts_num"}', // noobaa_total_usage gives the total usage of noobaa's storage in bytes. '{__name__="noobaa_total_usage"}', + // console_url is the url of the console running on the cluster. + '{__name__="console_url"}', ] ``` diff --git a/docs/sample-metrics.md b/docs/sample-metrics.md index 1f393d594..cea078fb6 100644 --- a/docs/sample-metrics.md +++ b/docs/sample-metrics.md @@ -13,7 +13,7 @@ return the full set of metrics that the Telemeter client captures: [embedmd]:# (telemeter_query txt) ```txt -{__name__="up"} or {__name__="cluster_version"} or {__name__="cluster_version_available_updates"} or {__name__="cluster_operator_up"} or {__name__="cluster_operator_conditions"} or {__name__="cluster_version_payload"} or {__name__="cluster_installer"} or {__name__="cluster_infrastructure_provider"} or {__name__="cluster_feature_set"} or {__name__="node_uname_info"} or {__name__="instance:etcd_object_counts:sum"} or {__name__="ALERTS",alertstate="firing"} or {__name__="code:apiserver_request_count:rate:sum"} or {__name__="cluster:capacity_cpu_cores:sum"} or {__name__="cluster:capacity_memory_bytes:sum"} or {__name__="cluster:cpu_usage_cores:sum"} or {__name__="cluster:memory_usage_bytes:sum"} or {__name__="openshift:cpu_usage_cores:sum"} or {__name__="openshift:memory_usage_bytes:sum"} or {__name__="workload:cpu_usage_cores:sum"} or {__name__="workload:memory_usage_bytes:sum"} or {__name__="cluster:node_instance_type_count:sum"} or {__name__="cnv:vmi_status_running:count"} or {__name__="node_role_os_version_machine:cpu_capacity_cores:sum"} or {__name__="subscription_sync_total"} or {__name__="ceph_cluster_total_bytes"} or {__name__="ceph_cluster_total_used_raw_bytes"} or {__name__="ceph_health_status"} or {__name__="job:ceph_osd_metadata:count"} or {__name__="job:kube_pv:count"} or {__name__="job:ceph_pools_iops:total"} or {__name__="job:ceph_pools_iops_bytes:total"} or {__name__="job:ceph_versions_running:count"} or {__name__="job:noobaa_total_unhealthy_buckets:sum"} or {__name__="job:noobaa_bucket_count:sum"} or {__name__="job:noobaa_total_object_count:sum"} or {__name__="noobaa_accounts_num"} or {__name__="noobaa_total_usage"} +{__name__="up"} or {__name__="cluster_version"} or {__name__="cluster_version_available_updates"} or {__name__="cluster_operator_up"} or {__name__="cluster_operator_conditions"} or {__name__="cluster_version_payload"} or {__name__="cluster_installer"} or {__name__="cluster_infrastructure_provider"} or {__name__="cluster_feature_set"} or {__name__="node_uname_info"} or {__name__="instance:etcd_object_counts:sum"} or {__name__="ALERTS",alertstate="firing"} or {__name__="code:apiserver_request_count:rate:sum"} or {__name__="cluster:capacity_cpu_cores:sum"} or {__name__="cluster:capacity_memory_bytes:sum"} or {__name__="cluster:cpu_usage_cores:sum"} or {__name__="cluster:memory_usage_bytes:sum"} or {__name__="openshift:cpu_usage_cores:sum"} or {__name__="openshift:memory_usage_bytes:sum"} or {__name__="workload:cpu_usage_cores:sum"} or {__name__="workload:memory_usage_bytes:sum"} or {__name__="cluster:node_instance_type_count:sum"} or {__name__="cnv:vmi_status_running:count"} or {__name__="node_role_os_version_machine:cpu_capacity_cores:sum"} or {__name__="subscription_sync_total"} or {__name__="ceph_cluster_total_bytes"} or {__name__="ceph_cluster_total_used_raw_bytes"} or {__name__="ceph_health_status"} or {__name__="job:ceph_osd_metadata:count"} or {__name__="job:kube_pv:count"} or {__name__="job:ceph_pools_iops:total"} or {__name__="job:ceph_pools_iops_bytes:total"} or {__name__="job:ceph_versions_running:count"} or {__name__="job:noobaa_total_unhealthy_buckets:sum"} or {__name__="job:noobaa_bucket_count:sum"} or {__name__="job:noobaa_total_object_count:sum"} or {__name__="noobaa_accounts_num"} or {__name__="noobaa_total_usage"} or {__name__="console_url"} ``` For reference, here is an example response produced by a running OpenShift cluster: diff --git a/jsonnet/telemeter/metrics.jsonnet b/jsonnet/telemeter/metrics.jsonnet index 4b798d515..8f51494f8 100644 --- a/jsonnet/telemeter/metrics.jsonnet +++ b/jsonnet/telemeter/metrics.jsonnet @@ -117,4 +117,6 @@ '{__name__="noobaa_accounts_num"}', // noobaa_total_usage gives the total usage of noobaa's storage in bytes. '{__name__="noobaa_total_usage"}', + // console_url is the url of the console running on the cluster. + '{__name__="console_url"}', ] diff --git a/manifests/benchmark/statefulSetTelemeterServer.yaml b/manifests/benchmark/statefulSetTelemeterServer.yaml index 83041c898..781fcf11a 100644 --- a/manifests/benchmark/statefulSetTelemeterServer.yaml +++ b/manifests/benchmark/statefulSetTelemeterServer.yaml @@ -63,6 +63,7 @@ spec: - --whitelist={__name__="job:noobaa_total_object_count:sum"} - --whitelist={__name__="noobaa_accounts_num"} - --whitelist={__name__="noobaa_total_usage"} + - --whitelist={__name__="console_url"} env: - name: NAME valueFrom: diff --git a/manifests/client/deployment.yaml b/manifests/client/deployment.yaml index 81554a747..538af908d 100644 --- a/manifests/client/deployment.yaml +++ b/manifests/client/deployment.yaml @@ -65,6 +65,7 @@ spec: - --match={__name__="job:noobaa_total_object_count:sum"} - --match={__name__="noobaa_accounts_num"} - --match={__name__="noobaa_total_usage"} + - --match={__name__="console_url"} env: - name: ANONYMIZE_LABELS value: ""