prometheus & grafana - fix for usage docs

[longwuyuan]

What this PR does / why we need it:

The documentation for prometheus & grafana installation is not describing how to enable metrics. The kustomization files for prometheus and grafana have hardcoded outdated versions. This PR inserts the instructions to enable metrics and also removes the tag for image from kustomization yaml file, so that latest prometheus and grafana gets installed. There is also instructions added to import the dashboard which was too short before.

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Which issue/s this PR fixes

fixes #7197
fixes #7285

How Has This Been Tested?

__$ k -n ingress-nginx describe deployments.apps prometheus-server 
Name:                   prometheus-server
Namespace:              ingress-nginx
CreationTimestamp:      Sat, 10 Jul 2021 13:11:01 +0530
Labels:                 app.kubernetes.io/name=prometheus
                        app.kubernetes.io/part-of=ingress-nginx
Annotations:            deployment.kubernetes.io/revision: 1
Selector:               app.kubernetes.io/name=prometheus,app.kubernetes.io/part-of=ingress-nginx
Replicas:               1 desired | 1 updated | 1 total | 1 available | 0 unavailable
StrategyType:           RollingUpdate
MinReadySeconds:        0
RollingUpdateStrategy:  25% max unavailable, 25% max surge
Pod Template:
  Labels:           app.kubernetes.io/name=prometheus
                    app.kubernetes.io/part-of=ingress-nginx
  Service Account:  prometheus-server
  Containers:
   prometheus:
    Image:      prom/prometheus
    Port:       9090/TCP
    Host Port:  0/TCP
    Args:
      --config.file=/etc/prometheus/prometheus.yaml
      --storage.tsdb.path=/prometheus/
    Environment:  <none>
    Mounts:
      /etc/prometheus/ from prometheus-config-volume (rw)
      /prometheus/ from prometheus-storage-volume (rw)
  Volumes:
   prometheus-config-volume:
    Type:      ConfigMap (a volume populated by a ConfigMap)
    Name:      prometheus-configuration-8hk4m6bf76
    Optional:  false
   prometheus-storage-volume:
    Type:       EmptyDir (a temporary directory that shares a pod's lifetime)
    Medium:     
    SizeLimit:  <unset>
Conditions:
  Type           Status  Reason
  ----           ------  ------
  Progressing    True    NewReplicaSetAvailable
  Available      True    MinimumReplicasAvailable
OldReplicaSets:  <none>
NewReplicaSet:   prometheus-server-779c8d44cf (1/1 replicas created)
Events:          <none>

__$ k -n ingress-nginx describe deployments.apps ingcontroller0-ingress-nginx-controller                                                                                                                      
Name:                   ingcontroller0-ingress-nginx-controller                                                                                                                                               
Namespace:              ingress-nginx                                                                                                                                                                         
CreationTimestamp:      Thu, 08 Jul 2021 06:44:20 +0530                                                                                                                                                       
Labels:                 app.kubernetes.io/component=controller                                                                                                                                                
                        app.kubernetes.io/instance=ingcontroller0                                                                                                                                             
                        app.kubernetes.io/managed-by=Helm                                                                                                                                                     
                        app.kubernetes.io/name=ingress-nginx                                                                                                                                                  
                        app.kubernetes.io/version=0.47.0                                                                                                                                                      
                        helm.sh/chart=ingress-nginx-3.34.0                                                                                                                                                    
Annotations:            deployment.kubernetes.io/revision: 2                                                                                                                                                  
                        meta.helm.sh/release-name: ingcontroller0                                                                                                                                             
                        meta.helm.sh/release-namespace: ingress-nginx                                                                                                                                         
Selector:               app.kubernetes.io/component=controller,app.kubernetes.io/instance=ingcontroller0,app.kubernetes.io/name=ingress-nginx                                                                 
Replicas:               1 desired | 1 updated | 1 total | 1 available | 0 unavailable                                                                                                                         
StrategyType:           RollingUpdate
MinReadySeconds:        0
RollingUpdateStrategy:  25% max unavailable, 25% max surge
Pod Template:
  Labels:           app.kubernetes.io/component=controller
                    app.kubernetes.io/instance=ingcontroller0
                    app.kubernetes.io/name=ingress-nginx
  Annotations:      prometheus.io/port: 10254
                    prometheus.io/scrape: true
  Service Account:  ingcontroller0-ingress-nginx
  Containers:
   controller:
    Image:       k8s.gcr.io/ingress-nginx/controller:v0.47.0@sha256:a1e4efc107be0bb78f32eaec37bef17d7a0c81bec8066cdf2572508d21351d0b
    Ports:       80/TCP, 443/TCP, 10254/TCP, 8443/TCP
    Host Ports:  0/TCP, 0/TCP, 0/TCP, 0/TCP
    Args:
      /nginx-ingress-controller
      --publish-service=$(POD_NAMESPACE)/ingcontroller0-ingress-nginx-controller
      --election-id=ingress-controller-leader
      --ingress-class=nginx
      --configmap=$(POD_NAMESPACE)/ingcontroller0-ingress-nginx-controller
      --validating-webhook=:8443
      --validating-webhook-certificate=/usr/local/certificates/cert
      --validating-webhook-key=/usr/local/certificates/key
    Requests:
      cpu:      100m
      memory:   90Mi
    Liveness:   http-get http://:10254/healthz delay=10s timeout=1s period=10s #success=1 #failure=5
    Readiness:  http-get http://:10254/healthz delay=10s timeout=1s period=10s #success=1 #failure=3
    Environment:
      POD_NAME:        (v1:metadata.name)
      POD_NAMESPACE:   (v1:metadata.namespace)
      LD_PRELOAD:     /usr/local/lib/libmimalloc.so
    Mounts:
      /usr/local/certificates/ from webhook-cert (ro)
  Volumes:
   webhook-cert:
    Type:        Secret (a volume populated by a Secret)
    SecretName:  ingcontroller0-ingress-nginx-admission
    Optional:    false
Conditions:
  Type           Status  Reason
  ----           ------  ------
  Progressing    True    NewReplicaSetAvailable
  Available      True    MinimumReplicasAvailable
OldReplicaSets:  <none>
NewReplicaSet:   ingcontroller0-ingress-nginx-controller-787ff955fd (1/1 replicas created)
Events:          <none>

Checklist:

• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I've read the CONTRIBUTION guide
• I have added tests to cover my changes.
• All new and existing tests passed.

[k8s-ci-robot]

Hi @longwuyuan. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[rikatz]

/ok-to-test

[rikatz]

Is this aligned?

Maybe

Suggested change

	controller:
	metrics:
	enabled: true
	service:
	annotations:
	prometheus.io/port: "10254"
	prometheus.io/scrape: "true"
	controller:
	metrics:
	enabled: true
	service:
	annotations:
	prometheus.io/port: "10254"
	prometheus.io/scrape: "true"

[longwuyuan]

indented as suggested

[rikatz]

@longwuyuan this documentation is really good!

Overall LGTM, just that really small nit about yaml alignment

/approve
Once you fix this, we can lgtm

Thanks!

[longwuyuan]

Its copied from that link blog but it needs to be changed to servicemonitor approach. Not an expert ...  :-) google helping me search and one user shared that link. Indenting fixed, looking for LGTMThanks,  -- ; Long 16 Jul 2021, 17:50 by ***@***.***:

…

@longwuyuan <https://github.com/longwuyuan>> this documentation is really good! Overall LGTM, just that really small nit about yaml alignment /approve Once you fix this, we can lgtm Thanks! — You are receiving this because you were mentioned. Reply to this email directly, > view it on GitHub <#7361 (comment)>> , or > unsubscribe <https://github.com/notifications/unsubscribe-auth/ABGZVWUVSCVBD3S7B533GXDTYAPZDANCNFSM5APIJPHQ>> .

[rikatz]

/lgtm
Thanks!

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: longwuyuan, rikatz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [rikatz]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment