Fix example-app manifests

hack/cluster-monitoring/deploy

@@ -13,8 +13,8 @@ kctl() {
 kctl apply -f manifests/prometheus-operator.yaml
 
 # Wait for TPRs to be ready.
-until kctl get servicemonitor; do sleep 0.1; done
+until kctl get servicemonitor; do sleep 1; done
-until kctl get prometheus; do sleep 0.1; done
+until kctl get prometheus; do sleep 1; done
 
 kctl apply -f manifests/exporters
 kctl apply -f manifests/grafana

manifests/examples/example-app/example-app-dev-depl.yaml

@@ -1,39 +0,0 @@
-kind: Service
-apiVersion: "v1"
-metadata: 
-  name: example-app
-  namespace: development
-  labels:
-    tier: frontend
-    team: frontend
-  annotations:
-    prometheus.io/scrape: 'true'
-spec: 
-  selector: 
-    app: example-app
-  ports:
-  - name: web
-    protocol: TCP
-    port: 8080
-    targetPort: web
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: example-app
-  namespace: development
-spec:
-  replicas: 3
-  template:
-    metadata:
-      labels:
-        app: example-app
-        version: 1.2.0
-    spec:
-      containers:
-      - name: example-app 
-        image: quay.io/fabxc/prometheus_demo_service
-        ports:
-        - name: web
-          containerPort: 8080
-          protocol: TCP

manifests/examples/example-app/example-app.yaml

@@ -1,11 +1,9 @@
 kind: Service
-apiVersion: "v1"
+apiVersion: v1
 metadata: 
   name: example-app
-  namespace: production
   labels:
     tier: frontend
-    team: frontend
   annotations:
     prometheus.io/scrape: 'true'
 spec: 
@@ -21,9 +19,8 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: example-app
-  namespace: production
 spec:
-  replicas: 5
+  replicas: 4
   template:
     metadata:
       labels:

manifests/examples/example-app/prometheus-frontend-svc.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: prometheus-frontend
-  namespace: default
 spec:
   type: NodePort
   ports:
@@ -12,5 +11,4 @@ spec:
     protocol: TCP
     targetPort: web
   selector:
-    prometheus.coreos.com/type: prometheus
+    prometheus: prometheus-frontend
-    prometheus.coreos.com/name: prometheus-frontend

manifests/examples/example-app/prometheus-frontend.yaml

@@ -1,4 +1,4 @@
-apiVersion: prometheus.coreos.com/v1alpha1
+apiVersion: monitoring.coreos.com/v1alpha1
 kind: Prometheus
 metadata:
   name: prometheus-frontend
@@ -6,7 +6,8 @@ metadata:
   labels:
     prometheus: frontend
 spec:
+  version: v1.3.0
   serviceMonitors:
   - selector:
       matchLabels:
-        team: frontend
+        tier: frontend

manifests/examples/example-app/servicemonitor-frontend.yaml

@@ -1,14 +1,13 @@
-apiVersion: prometheus.coreos.com/v1alpha1
+apiVersion: monitoring.coreos.com/v1alpha1
 kind: ServiceMonitor
 metadata:
   name: frontend
-  namespace: default
   labels:
-    team: frontend
+    tier: frontend
 spec:
   selector:
     matchLabels:
-      team: frontend
+      tier: frontend
   endpoints:
   - port: web
     interval: 10s