Merge pull request #163 from Helene/yaml_config

Improve prometheus yaml examples

Author: Helene

examples/prometheus_config_file/multiple_targets/prometheus.yml

@@ -65,18 +65,6 @@ scrape_configs:
     static_configs:
     - targets: ['<cluster1_grafana_bridge_ip>:9250']
 
-  - job_name: 'GPFSWaiters_cluster1'
-    scrape_interval: 10s
-    honor_timestamps: true
-    metrics_path: '/metrics_gpfs_waiters'
-    scheme: https
-    tls_config:
-      cert_file: /etc/prometheus/certs/cluster1/cert.pem
-      key_file: /etc/prometheus/certs/cluster1/privkey.pem
-      insecure_skip_verify: true
-    static_configs:
-    - targets: ['<cluster1_grafana_bridge_ip>:9250']
-
   - job_name: 'GPFSFilesystem_cluster2'
     scrape_interval: 300s
     honor_timestamps: true
@@ -111,16 +99,4 @@ scrape_configs:
       key_file: /etc/prometheus/certs/cluster2/privkey.pem
       insecure_skip_verify: true
     static_configs:
-    - targets: ['<cluster2_grafana_bridge_ip>:9250']
-
-  - job_name: 'GPFSWaiters_cluster2'
-    scrape_interval: 10s
-    honor_timestamps: true
-    metrics_path: '/metrics_gpfs_waiters'
-    scheme: https
-    tls_config:
-      cert_file: /etc/prometheus/certs/cluster2/cert.pem
-      key_file: /etc/prometheus/certs/cluster2/privkey.pem
-      insecure_skip_verify: true
-    static_configs:
     - targets: ['<cluster2_grafana_bridge_ip>:9250']

examples/prometheus_config_file/prometheus.yml

@@ -63,16 +63,4 @@ scrape_configs:
       key_file: /etc/prometheus/certs/privkey.pem
       insecure_skip_verify: true
     static_configs:
-    - targets: ['<grafana_bridge_ip>:9250']
-
-  - job_name: 'GPFSWaiters'
-    scrape_interval: 10s
-    honor_timestamps: true
-    metrics_path: '/metrics_gpfs_waiters'
-    scheme: https
-    tls_config:
-      cert_file: /etc/prometheus/certs/cert.pem
-      key_file: /etc/prometheus/certs/privkey.pem
-      insecure_skip_verify: true
-    static_configs:
-    - targets: ['<grafana_bridge_ip>:9250']
+    - targets: ['<grafana_bridge_ip>:9250']

source/config.ini

@@ -24,13 +24,13 @@ protocol = http
 #################################### API SSL OAuth ############################
 [tls]
 # Directory path of tls key and cert file location
-#tlsKeyPath = /etc/bridge_cert/certs
+# tlsKeyPath = /etc/bridge_ssl/certs
 
 # Name of tls private key file
-#tlsKeyFile = privkey.pem
+# tlsKeyFile = privkey.pem
 
 # Name of tls certificate file
-#tlsCertFile = cert.pem
+# tlsCertFile = cert.pem