Skip to content

Commit 6fe1040

Browse files
Merge branch 'main' into K8SPG-984-k8s-upgrade
2 parents 24e7982 + 2b9a623 commit 6fe1040

5 files changed

Lines changed: 414 additions & 355 deletions

File tree

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
commands:
4+
- script: |-
5+
set -o errexit
6+
set -o xtrace
7+
8+
source ../../functions
9+
10+
series_fetched=$(curl --insecure -G "https://admin:admin@$(get_service_ip monitoring-service)/prometheus/api/v1/query_range" \
11+
--data-urlencode "query=node_filesystem_free_bytes{mountpoint=\"/pgdata\"}" \
12+
--data-urlencode "start=$(($(date +%s) - 300))" \
13+
--data-urlencode "end=$(date +%s)" \
14+
--data-urlencode "step=5s" | jq -r '.stats.seriesFetched')
15+
16+
if [[ $series_fetched == 0 ]]; then
17+
echo "seriesFetched is 0"
18+
exit 1
19+
fi
20+
timeout: 360

e2e-tests/tests/monitoring-pmm3/08-check-password-leak.yaml renamed to e2e-tests/tests/monitoring-pmm3/09-check-password-leak.yaml

File renamed without changes.

e2e-tests/vars.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ export BUCKET=${BUCKET:-"pg-operator-testing"}
4444
export PMM_SERVER_VERSION=${PMM_SERVER_VERSION:-"9.9.9"}
4545
export IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"perconalab/pmm-client:dev-latest"}
4646
export IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:dev-latest"}
47-
export IMAGE_PMM3_CLIENT=${IMAGE_PMM3_CLIENT:-"perconalab/pmm-client:3.4"}
48-
export IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3.4"}
47+
export IMAGE_PMM3_CLIENT=${IMAGE_PMM3_CLIENT:-"perconalab/pmm-client:3-dev-latest"}
48+
export IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3-dev-latest"}
4949
export PGOV1_TAG=${PGOV1_TAG:-"1.4.0"}
5050
export PGOV1_VER=${PGOV1_VER:-"14"}
5151
export MINIO_VER="5.4.0"

0 commit comments

Comments
 (0)