axe the operator

k8s/install.sh

@@ -130,8 +130,8 @@ kubectl apply -f ./kops-weave/weave.yml \
               -f ./sidecar.yaml
 
 echo "Installing Prometheus"
-pushd prometheus-operator
-helm install prometheus-operator stable/prometheus-operator -f values.yaml
+pushd prometheus
+helm install prometheus stable/prometheus -f values.yaml
 popd
 
 echo "Installing InfluxDB"
@@ -149,7 +149,6 @@ echo "Install Weave service monitor..."
 echo
 
 kubectl apply -f ./kops-weave/weave-metrics-service.yml \
-              -f ./kops-weave/weave-service-monitor.yml
 
 echo "Install Testground daemon..."
 echo

k8s/prometheus/values.yaml

@@ -0,0 +1,25 @@
+serviceAccounts:
+  alertmanager:
+    create: false
+  pushgateway:
+    create: false
+alertmanager:
+  enabled: false
+server:
+  extraArgs:
+    query.max-samples: 10
+    query.max-concurrency: 2
+  extraFlags:
+    - storage.tsdb.wal-compression
+    - web.enable-admin-api
+  replicaCount: 3
+  persistentVolume:
+    enabled: false
+  resources:
+    requests:
+      memory: 6000Mi
+      cpu: 1000m
+    limits:
+      memory: 6000Mi
+pushgateway:
+  enabled: false

k8s/testground-infra/values.yaml

@@ -12,8 +12,7 @@ redis:
   metrics:
     enabled: true
     serviceMonitor:
-      enabled: true
-      namespace: default
+      enabled: false
     resources:
       requests:
         memory: 256Mi