Merge pull request #212 from crawford/cluster_installer

metrics: gather cluster_installer series
openshift · Aug 5, 2019 · 8c708d1 · 8c708d1
2 parents 7b10ce9 + 2eb01ce
commit 8c708d1
Show file tree

Hide file tree

Showing 8 changed files with 453 additions and 424 deletions.
diff --git a/docs/data-collection.md b/docs/data-collection.md
@@ -37,6 +37,9 @@ For the OpenShift 4 Developer Preview we will be sending back these exact attrib
   // can be used to identify whether a set of errors that occur during
   // an upgrade are trending up or down from previous updates.
   '{__name__="cluster_version_payload_errors"}',
+  // cluster_installer reports what installed the cluster, along with its
+  // version number and invoker.
+  '{__name__="cluster_installer"}',
   // instance:etcd_object_counts:sum identifies two key metrics:
   // - the rough size of the data stored in etcd and
   // - the consistency between the etcd instances.

diff --git a/docs/sample-metrics.md b/docs/sample-metrics.md
diff --git a/jsonnet/telemeter/metrics.jsonnet b/jsonnet/telemeter/metrics.jsonnet
@@ -29,6 +29,9 @@
   // can be used to identify whether a set of errors that occur during
   // an upgrade are trending up or down from previous updates.
   '{__name__="cluster_version_payload_errors"}',
+  // cluster_installer reports what installed the cluster, along with its
+  // version number and invoker.
+  '{__name__="cluster_installer"}',
   // instance:etcd_object_counts:sum identifies two key metrics:
   // - the rough size of the data stored in etcd and
   // - the consistency between the etcd instances.

diff --git a/manifests/benchmark/secretTelemeterServer.yaml b/manifests/benchmark/secretTelemeterServer.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
   tokens.json: W3sidG9rZW4iOiAiYmVuY2htYXJrIn1d
-  whitelist: e19fbmFtZV9fPSJ1cCJ9CntfX25hbWVfXz0iY2x1c3Rlcl92ZXJzaW9uIn0Ke19fbmFtZV9fPSJjbHVzdGVyX3ZlcnNpb25fYXZhaWxhYmxlX3VwZGF0ZXMifQp7X19uYW1lX189ImNsdXN0ZXJfb3BlcmF0b3JfdXAifQp7X19uYW1lX189ImNsdXN0ZXJfb3BlcmF0b3JfY29uZGl0aW9ucyJ9CntfX25hbWVfXz0iY2x1c3Rlcl92ZXJzaW9uX3BheWxvYWQifQp7X19uYW1lX189ImNsdXN0ZXJfdmVyc2lvbl9wYXlsb2FkX2Vycm9ycyJ9CntfX25hbWVfXz0iaW5zdGFuY2U6ZXRjZF9vYmplY3RfY291bnRzOnN1bSJ9CntfX25hbWVfXz0iYWxlcnRzIixhbGVydHN0YXRlPSJmaXJpbmcifQp7X19uYW1lX189ImNvZGU6YXBpc2VydmVyX3JlcXVlc3RfY291bnQ6cmF0ZTpzdW0ifQp7X19uYW1lX189Imt1YmVfcG9kX3N0YXR1c19yZWFkeTpldGNkOnN1bSJ9CntfX25hbWVfXz0ia3ViZV9wb2Rfc3RhdHVzX3JlYWR5OmltYWdlX3JlZ2lzdHJ5OnN1bSJ9CntfX25hbWVfXz0iY2x1c3RlcjpjYXBhY2l0eV9jcHVfY29yZXM6c3VtIn0Ke19fbmFtZV9fPSJjbHVzdGVyOmNhcGFjaXR5X21lbW9yeV9ieXRlczpzdW0ifQp7X19uYW1lX189ImNsdXN0ZXI6Y3B1X3VzYWdlX2NvcmVzOnN1bSJ9CntfX25hbWVfXz0iY2x1c3RlcjptZW1vcnlfdXNhZ2VfYnl0ZXM6c3VtIn0Ke19fbmFtZV9fPSJvcGVuc2hpZnQ6Y3B1X3VzYWdlX2NvcmVzOnN1bSJ9CntfX25hbWVfXz0ib3BlbnNoaWZ0Om1lbW9yeV91c2FnZV9ieXRlczpzdW0ifQp7X19uYW1lX189ImNsdXN0ZXI6bm9kZV9pbnN0YW5jZV90eXBlX2NvdW50OnN1bSJ9CntfX25hbWVfXz0ic3Vic2NyaXB0aW9uX3N5bmNfdG90YWwifQ==
+  whitelist: e19fbmFtZV9fPSJ1cCJ9CntfX25hbWVfXz0iY2x1c3Rlcl92ZXJzaW9uIn0Ke19fbmFtZV9fPSJjbHVzdGVyX3ZlcnNpb25fYXZhaWxhYmxlX3VwZGF0ZXMifQp7X19uYW1lX189ImNsdXN0ZXJfb3BlcmF0b3JfdXAifQp7X19uYW1lX189ImNsdXN0ZXJfb3BlcmF0b3JfY29uZGl0aW9ucyJ9CntfX25hbWVfXz0iY2x1c3Rlcl92ZXJzaW9uX3BheWxvYWQifQp7X19uYW1lX189ImNsdXN0ZXJfdmVyc2lvbl9wYXlsb2FkX2Vycm9ycyJ9CntfX25hbWVfXz0iY2x1c3Rlcl9pbnN0YWxsZXIifQp7X19uYW1lX189Imluc3RhbmNlOmV0Y2Rfb2JqZWN0X2NvdW50czpzdW0ifQp7X19uYW1lX189ImFsZXJ0cyIsYWxlcnRzdGF0ZT0iZmlyaW5nIn0Ke19fbmFtZV9fPSJjb2RlOmFwaXNlcnZlcl9yZXF1ZXN0X2NvdW50OnJhdGU6c3VtIn0Ke19fbmFtZV9fPSJrdWJlX3BvZF9zdGF0dXNfcmVhZHk6ZXRjZDpzdW0ifQp7X19uYW1lX189Imt1YmVfcG9kX3N0YXR1c19yZWFkeTppbWFnZV9yZWdpc3RyeTpzdW0ifQp7X19uYW1lX189ImNsdXN0ZXI6Y2FwYWNpdHlfY3B1X2NvcmVzOnN1bSJ9CntfX25hbWVfXz0iY2x1c3RlcjpjYXBhY2l0eV9tZW1vcnlfYnl0ZXM6c3VtIn0Ke19fbmFtZV9fPSJjbHVzdGVyOmNwdV91c2FnZV9jb3JlczpzdW0ifQp7X19uYW1lX189ImNsdXN0ZXI6bWVtb3J5X3VzYWdlX2J5dGVzOnN1bSJ9CntfX25hbWVfXz0ib3BlbnNoaWZ0OmNwdV91c2FnZV9jb3JlczpzdW0ifQp7X19uYW1lX189Im9wZW5zaGlmdDptZW1vcnlfdXNhZ2VfYnl0ZXM6c3VtIn0Ke19fbmFtZV9fPSJjbHVzdGVyOm5vZGVfaW5zdGFuY2VfdHlwZV9jb3VudDpzdW0ifQp7X19uYW1lX189InN1YnNjcmlwdGlvbl9zeW5jX3RvdGFsIn0=
 kind: Secret
 metadata:
   labels:

diff --git a/manifests/client/deployment.yaml b/manifests/client/deployment.yaml
@@ -34,6 +34,7 @@ spec:
         - --match={__name__="cluster_operator_conditions"}
         - --match={__name__="cluster_version_payload"}
         - --match={__name__="cluster_version_payload_errors"}
+        - --match={__name__="cluster_installer"}
         - --match={__name__="instance:etcd_object_counts:sum"}
         - --match={__name__="ALERTS",alertstate="firing"}
         - --match={__name__="code:apiserver_request_count:rate:sum"}

diff --git a/manifests/server/list.yaml b/manifests/server/list.yaml
@@ -133,6 +133,7 @@ objects:
           - --whitelist={__name__="cluster_operator_conditions"}
           - --whitelist={__name__="cluster_version_payload"}
           - --whitelist={__name__="cluster_version_payload_errors"}
+          - --whitelist={__name__="cluster_installer"}
           - --whitelist={__name__="instance:etcd_object_counts:sum"}
           - --whitelist={__name__="alerts",alertstate="firing"}
           - --whitelist={__name__="code:apiserver_request_count:rate:sum"}

diff --git a/manifests/server/statefulSet.yaml b/manifests/server/statefulSet.yaml
@@ -40,6 +40,7 @@ spec:
         - --whitelist={__name__="cluster_operator_conditions"}
         - --whitelist={__name__="cluster_version_payload"}
         - --whitelist={__name__="cluster_version_payload_errors"}
+        - --whitelist={__name__="cluster_installer"}
         - --whitelist={__name__="instance:etcd_object_counts:sum"}
         - --whitelist={__name__="alerts",alertstate="firing"}
         - --whitelist={__name__="code:apiserver_request_count:rate:sum"}