Updated procedure related to accessing registry metrics.

Author: subhtk

modules/registry-accessing-metrics.adoc

@@ -18,12 +18,47 @@ endpoint.
 
 .Procedure
 
-There are two ways in which you can access the metrics, running a metrics query
-or using the cluster role.
+You can access the metrics by running a metrics query using a cluster role.
+
+*Cluster role*
+
+. Create a cluster role if you do not already have one to access the metrics:
++
+[source,terminal]
+----
+$ cat <<EOF | oc create -f -
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: prometheus-scraper
+rules:
+- apiGroups:
+  - image.openshift.io
+  resources:
+  - registry/metrics
+  verbs:
+  - get
+EOF
+----
+
+. Add this role to a user, run the following command:
++
+[source,terminal]
+----
+$ oc adm policy add-cluster-role-to-user prometheus-scraper <username>
+----
 
 *Metrics query*
 
-. Run a metrics query, for example:
+. Get the user token.
++
+[source,terminal]
+----
+openshift:
+$ oc whoami -t
+----
+
+. Run a metrics query in node or inside a pod, for example:
 +
 [source,terminal]
 ----
@@ -55,45 +90,4 @@ imageregistry_http_request_duration_seconds{method="get",quantile="0.9"} 0.01484
 imageregistry_http_request_duration_seconds{method="get",quantile="0.99"} 0.015981195
 imageregistry_http_request_duration_seconds_sum{method="get"} 12.260727916000022
 ----
-<1> `<user>` can be arbitrary, but `<secret>` must match the value specified in the
-registry configuration.
-
-*Cluster role*
-
-. Create a cluster role if you do not already have one to access the metrics:
-+
-[source,terminal]
-----
-$ cat <<EOF | oc create -f -
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: prometheus-scraper
-rules:
-- apiGroups:
-  - image.openshift.io
-  resources:
-  - registry/metrics
-  verbs:
-  - get
-EOF
-----
-
-. Add this role to a user, run the following command:
-+
-[source,terminal]
-----
-$ oc adm policy add-cluster-role-to-user prometheus-scraper <username>
-----
-
-. Access the metrics using cluster role. The part of
-the configuration file responsible for metrics should look like this:
-+
-[source,yaml]
-----
-openshift:
-  version: 1.0
-  metrics:
-    enabled: true
-...
-----
+<1> The `<user>` object can be arbitrary, but `<secret>` tag must use the user token.