diff --git a/k8s/install.sh b/k8s/install.sh index 3e7423a6..b2917a8f 100755 --- a/k8s/install.sh +++ b/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 diff --git a/k8s/kops-weave/weave-service-monitor.yml b/k8s/kops-weave/weave-service-monitor.yml deleted file mode 100644 index 804e5384..00000000 --- a/k8s/kops-weave/weave-service-monitor.yml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: weave-net - labels: - k8s-app: weave-net - namespace: default -spec: - jobLabel: k8s-app - selector: - matchLabels: - k8s-app: weave-net - namespaceSelector: - matchNames: - - kube-system - endpoints: - - port: weave-metrics - path: /metrics - interval: 5s diff --git a/k8s/prometheus/values.yaml b/k8s/prometheus/values.yaml new file mode 100644 index 00000000..e6ee128a --- /dev/null +++ b/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 diff --git a/k8s/testground-infra/values.yaml b/k8s/testground-infra/values.yaml index ca21b4db..0bbf8c51 100644 --- a/k8s/testground-infra/values.yaml +++ b/k8s/testground-infra/values.yaml @@ -12,8 +12,7 @@ redis: metrics: enabled: true serviceMonitor: - enabled: true - namespace: default + enabled: false resources: requests: memory: 256Mi