Merge branch 'bjk/issue_2343' into 'master'

Re-apply workaround for Kubernetes 1.6 auth

Closes #2343

See merge request !1550

files/gitlab-cookbooks/gitlab/libraries/prometheus.rb

@@ -224,6 +224,18 @@ module Prometheus
               'action' => 'labelmap',
               'regex' => '__meta_kubernetes_node_label_(.+)',
             },
+            {
+              'source_labels' => ['__address__'],
+              'target_label' => '__address__',
+              'regex' => '([^:;]+):([0-9]+)',
+              'replacement' => '${1}:10255',
+            },
+            {
+              'source_labels' => ['__scheme__'],
+              'target_label' => '__scheme__',
+              'regex' => 'https',
+              'replacement' => 'http',
+            },
           ],
           'metric_relabel_configs' => [
             {

spec/chef/recipes/prometheus_spec.rb

@@ -52,6 +52,16 @@ prometheus_yml_output = <<-PROMYML
     relabel_configs:
     - action: labelmap
       regex: __meta_kubernetes_node_label_(.+)
+    - source_labels:
+      - __address__
+      target_label: __address__
+      regex: "([^:;]+):([0-9]+)"
+      replacement: "${1}:10255"
+    - source_labels:
+      - __scheme__
+      target_label: __scheme__
+      regex: https
+      replacement: http
     metric_relabel_configs:
     - source_labels:
       - pod_name