updated readme, metadata, and prometheus metadata to reflect addition…

…al metrics

dashboards/jenkins/README.md

@@ -7,4 +7,4 @@
 |Jenkins Prometheus|
 |:------------------|
 |Filename: [jenkins-prometheus.json](jenkins-prometheus.json)|
-|This dashboard has charts displaying: `Health Check`, `Executor In Use`, `Nodes Offline`, `Executor Free`, `Plugins Failed`, `JVM Memory Free %`, `Job Build Speed`, `Queue Size`, `Job Queued Rate`, `Resource Usage`, and `Job Queue Duration`|
+|This dashboard has charts displaying: `Health Check`, `CPU Load`, `Executor In Use`, `Nodes Offline`, `Executor Free`, `Plugins Failed`, `JVM Memory Free %`, `Time Spent Building`, `Time Spent In Buildable State`, `Time Spent In Waiting State`, `Time Spent In Blocked State`, `Build Queue Size`, `Build Queue Buildable Jobs`, `Build Queue Pending Jobs`, and `Build Queue Blocked Jobs` |

dashboards/jenkins/metadata.yaml

@@ -4,7 +4,7 @@ sample_dashboards:
     id: jenkins-prometheus
     display_name: Jenkins Prometheus Overview
     description: |-
-      This dashboard has charts displaying: Health Check, Executor In Use, Nodes Offline, Executor Free, Plugins Failed, JVM Memory Free %, Job Build Speed, Queue Size, Job Queued Rate, Resource Usage, and Job Queue Duration
+      This dashboard has charts displaying: Health Check, CPU Load, Executor In Use, Nodes Offline, Executor Free, Plugins Failed, JVM Memory Free %, Time Spent Building, Time Spent In Buildable State, Time Spent In Waiting State, Time Spent In Blocked State, Build Queue Size, Build Queue Buildable Jobs, Build Queue Pending Jobs, and Build Queue Blocked Jobs.
     related_integrations:
       - id: jenkins
         platform: GKE

integrations/jenkins/prometheus_metadata.yaml

@@ -41,10 +41,34 @@ platforms:
         prometheus_name: jenkins_job_building_duration
         kind: GAUGE
         value_type: DOUBLE
+      - name: prometheus.googleapis.com/jenkins_job_buildable_duration/summary
+        prometheus_name: jenkins_job_buildable_duration
+        kind: GAUGE
+        value_type: DOUBLE
+      - name: prometheus.googleapis.com/jenkins_job_waiting_duration/summary
+        prometheus_name: jenkins_job_waiting_duration
+        kind: GAUGE
+        value_type: DOUBLE
+      - name: prometheus.googleapis.com/jenkins_job_blocked_duration/summary
+        prometheus_name: jenkins_job_blocked_duration
+        kind: GAUGE
+        value_type: DOUBLE
       - name: prometheus.googleapis.com/jenkins_queue_size_value/gauge
         prometheus_name: jenkins_queue_size_value
         kind: GAUGE
         value_type: DOUBLE
+      - name: prometheus.googleapis.com/jenkins_queue_buildable_value/gauge
+        prometheus_name: jenkins_queue_buildable_value
+        kind: GAUGE
+        value_type: DOUBLE
+      - name: prometheus.googleapis.com/jenkins_queue_pending_value/gauge
+        prometheus_name: jenkins_queue_pending_value
+        kind: GAUGE
+        value_type: DOUBLE
+      - name: prometheus.googleapis.com/jenkins_queue_blocked_value/gauge
+        prometheus_name: jenkins_queue_blocked_value
+        kind: GAUGE
+        value_type: DOUBLE
       - name: prometheus.googleapis.com/jenkins_job_queuing_duration_count/summary
         prometheus_name: jenkins_job_queuing_duration_count
         kind: CUMULATIVE