Merge pull request #12 from keptn/release-0.3.0

Release 0.3.0

README.md

@@ -8,7 +8,7 @@ Maintained examples are expected to be updated with every keptn release, to use
 
 |Name | Description | Notable Features Used | Complexity Level|
 ------------- | ------------- | ------------ | ------------ |
-| **onboard-carts** | This example builds on [keptn 0.2.0](https://github.com/keptn/keptn/tree/0.2.0) and is required to demonstrate the [onboarding of a service use case](https://keptn.sh/docs/0.2.0/usecases/onboard-carts-service/). | - | Beginner |
+| **onboard-carts** | This example builds on keptn >=0.2.0 and is required to demonstrate the [onboarding of a service use case](https://keptn.sh/docs/0.3.0/usecases/onboard-carts-service/). | - | Beginner |
 | [**Sockshop**](https://github.com/keptn-sockshop) | This example builds on [keptn 0.1.0](https://github.com/keptn/keptn/tree/0.1.0) and provides four use cases to explore the functionality of keptn. | Kubernetes, Dynatrace, Jenkins, Istio, Ansible Tower | Intermediate |
 
 > Note: Please add examples that are maintained to the list above.

monitoring/prometheus/config-map.yaml

@@ -81,83 +81,4 @@ data:
           regex: (.+)
           target_label: __metrics_path__
           replacement: /api/v1/nodes/${1}/proxy/metrics
-
-      
-      - job_name: 'kubernetes-pods'
-
-        kubernetes_sd_configs:
-        - role: pod
-
-        relabel_configs:
-        - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
-          action: keep
-          regex: true
-        - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
-          action: replace
-          target_label: __metrics_path__
-          regex: (.+)
-        - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
-          action: replace
-          regex: ([^:]+)(?::\d+)?;(\d+)
-          replacement: $1:$2
-          target_label: __address__
-        - action: labelmap
-          regex: __meta_kubernetes_pod_label_(.+)
-        - source_labels: [__meta_kubernetes_namespace]
-          action: replace
-          target_label: kubernetes_namespace
-        - source_labels: [__meta_kubernetes_pod_name]
-          action: replace
-          target_label: kubernetes_pod_name
-
-      - job_name: 'kubernetes-cadvisor'
-
-        scheme: https
-
-        tls_config:
-          ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-        bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-
-        kubernetes_sd_configs:
-        - role: node
-
-        relabel_configs:
-        - action: labelmap
-          regex: __meta_kubernetes_node_label_(.+)
-        - target_label: __address__
-          replacement: kubernetes.default.svc:443
-        - source_labels: [__meta_kubernetes_node_name]
-          regex: (.+)
-          target_label: __metrics_path__
-          replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor
       
-      - job_name: 'kubernetes-service-endpoints'
-
-        kubernetes_sd_configs:
-        - role: endpoints
-
-        relabel_configs:
-        - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
-          action: keep
-          regex: true
-        - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
-          action: replace
-          target_label: __scheme__
-          regex: (https?)
-        - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
-          action: replace
-          target_label: __metrics_path__
-          regex: (.+)
-        - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
-          action: replace
-          target_label: __address__
-          regex: ([^:]+)(?::\d+)?;(\d+)
-          replacement: $1:$2
-        - action: labelmap
-          regex: __meta_kubernetes_service_label_(.+)
-        - source_labels: [__meta_kubernetes_namespace]
-          action: replace
-          target_label: kubernetes_namespace
-        - source_labels: [__meta_kubernetes_service_name]
-          action: replace
-          target_label: kubernetes_name

monitoring/prometheus/deployPrometheusOnOpenshift.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+export GATEWAY=$(kubectl describe route istio-wildcard-ingress -n istio-system | yq r - Status.Ingress.Host | sed 's~www.~~')
+
+rm -f gen/config-map.yaml
+
+cat config-map.yaml | \
+  sed 's~GATEWAY_PLACEHOLDER~'"$GATEWAY"'~g' >> gen/config-map.yaml
+
+kubectl apply -f namespace.yaml
+kubectl apply -f gen/config-map.yaml
+kubectl apply -f cluster-role.yaml
+kubectl apply -f prometheus.yaml