Skip to content

Commit 7caf06f

Browse files
Export prometheus flags
1 parent 744a5d9 commit 7caf06f

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

tests/tasks/generators/clusterloader/load-slos.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,6 @@ spec:
8383
NODE_MODE: master
8484
CL2_DISABLE_DAEMONSETS: true
8585
CL2_RATE_LIMIT_POD_CREATION: false
86-
# Enable prometheus flags
87-
ENABLE_PROMETHEUS_SERVER: true
88-
PROMETHEUS_PVC_STORAGE_CLASS: gp2
89-
PROMETHEUS_SCRAPE_KUBE_PROXY: true
90-
PROMETHEUS_SCRAPE_APISERVER_ONLY: true
91-
PROMETHEUS_SCRAPE_KUBELETS: true
92-
PROMETHEUS_SCRAPE_KUBE_STATE_METRICS: true
93-
PROMETHEUS_KUBE_PROXY_SELECTOR_KEY: k8s-app
9486
# enable SLOs related CL2 vars
9587
CL2_NETWORK_LATENCY_THRESHOLD: 1s
9688
CL2_ENABLE_VIOLATIONS_FOR_NETWORK_PROGRAMMING_LATENCIES: true
@@ -160,11 +152,18 @@ spec:
160152
script: |
161153
#!/bin/bash
162154
if [ -n "$(params.amp-workspace-id)" ]; then
163-
CL2_PROMETHEUS_FLAGS="--enable-prometheus-server=true --prometheus-pvc-storage-class gp2"
155+
# Enable prometheus flags
156+
export ENABLE_PROMETHEUS_SERVER=true
157+
export PROMETHEUS_PVC_STORAGE_CLASS=gp2
158+
export PROMETHEUS_SCRAPE_KUBE_PROXY=true
159+
export PROMETHEUS_SCRAPE_APISERVER_ONLY=true
160+
export PROMETHEUS_SCRAPE_KUBELETS=true
161+
export PROMETHEUS_SCRAPE_KUBE_STATE_METRICS=true
162+
export PROMETHEUS_KUBE_PROXY_SELECTOR_KEY=k8s-app
164163
fi
165164
cat $(workspaces.source.path)/perf-tests/clusterloader2/testing/load/config.yaml
166165
cd $(workspaces.source.path)/perf-tests/clusterloader2/
167-
ENABLE_EXEC_SERVICE=false ./clusterloader --kubeconfig=$KUBECONFIG --testconfig=$(workspaces.source.path)/perf-tests/clusterloader2/testing/load/config.yaml --testoverrides=$(workspaces.source.path)/overrides.yaml --nodes=$(params.nodes) --provider=eks --report-dir=$(workspaces.results.path) --alsologtostderr --v=2 $CL2_PROMETHEUS_FLAGS
166+
ENABLE_EXEC_SERVICE=false ./clusterloader --kubeconfig=$KUBECONFIG --testconfig=$(workspaces.source.path)/perf-tests/clusterloader2/testing/load/config.yaml --testoverrides=$(workspaces.source.path)/overrides.yaml --nodes=$(params.nodes) --provider=eks --report-dir=$(workspaces.results.path) --alsologtostderr --v=2
168167
exit_code=$?
169168
if [ $exit_code -eq 0 ]; then
170169
echo "1" | tee $(results.datapoint.path)

0 commit comments

Comments
 (0)