From c04c1825ac3f1155c5c85e77cb6ccd675467efab Mon Sep 17 00:00:00 2001 From: Jenny Li Date: Fri, 4 Mar 2022 13:59:56 +0800 Subject: [PATCH] Decrease scrape interval (#15865) 1. remove scrape interval to use default one 2. remove the not used limit values for better reading Signed-off-by: Jenny Li --- tests/scripts/values/nightly.yaml | 2 - tests/scripts/values/pr.yaml | 59 ++--------------------------- tests/scripts/values/qa/pr.yaml | 62 +++---------------------------- 3 files changed, 9 insertions(+), 114 deletions(-) diff --git a/tests/scripts/values/nightly.yaml b/tests/scripts/values/nightly.yaml index 4e016fb924..e2245a39a5 100644 --- a/tests/scripts/values/nightly.yaml +++ b/tests/scripts/values/nightly.yaml @@ -1,8 +1,6 @@ metrics: serviceMonitor: enabled: true - interval: "5s" - scrapeTimeout: "5s" pulsar: bookkeeper: volumes: diff --git a/tests/scripts/values/pr.yaml b/tests/scripts/values/pr.yaml index 1004ba7967..269ae77c5a 100644 --- a/tests/scripts/values/pr.yaml +++ b/tests/scripts/values/pr.yaml @@ -1,77 +1,52 @@ metrics: serviceMonitor: enabled: true - interval: "5s" - scrapeTimeout: "5s" proxy: resources: requests: cpu: "0.3" memory: "256Mi" - # limits: - # cpu: "0.5" - # memory: "512Mi" rootCoordinator: resources: requests: cpu: "0.3" memory: "256Mi" - # limits: - # cpu: "0.6" - # memory: "512Mi" queryCoordinator: resources: requests: cpu: "0.4" memory: "100Mi" - # limits: - # cpu: "1.1" - # memory: "256Mi" queryNode: resources: requests: cpu: "2" memory: "500Mi" - limits: - # cpu: "2" - # memory: "1.5Gi" indexCoordinator: resources: requests: cpu: "0.1" memory: "50Mi" - # limits: - # cpu: "0.1" - # memory: "100Mi" indexNode: resources: requests: cpu: "4" memory: "500Mi" - # limits: - # cpu: "4" - # memory: "1.5Gi" dataCoordinator: resources: requests: cpu: "0.1" memory: "50Mi" - # limits: - # cpu: "0.2" - # memory: "100Mi" dataNode: resources: requests: cpu: "0.5" memory: "500Mi" - # limits: - # cpu: "1.2" - # memory: "1.5Gi" + pulsar: proxy: configData: @@ -80,25 +55,16 @@ pulsar: requests: cpu: "1" memory: "2Gi" - # limits: - # cpu: "1" - # memory: "4Gi" # Resources for the websocket proxy wsResources: requests: memory: "512Mi" cpu: "0.3" - # limits: - # memory: "512Mi" - # cpu: "0.3" broker: resources: requests: cpu: "1.5" memory: "4Gi" - # limits: - # cpu: "1.5" - # memory: "8Gi" configData: PULSAR_MEM: "\"-Xms4096m -Xmx4096m -XX:MaxDirectMemorySize=8192m -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem\"" @@ -124,26 +90,19 @@ pulsar: requests: cpu: 1 memory: "4Gi" - # limits: - # cpu: 1 - # memory: "8Gi" bastion: resources: requests: cpu: "0.3" memory: "50Mi" - # limits: - # cpu: "0.3" - # memory: "50Mi" + autorecovery: resources: requests: cpu: "1" memory: "512Mi" - # limits: - # cpu: "1" - # memory: "1Gi" + zookeeper: volumes: data: @@ -154,25 +113,16 @@ pulsar: requests: cpu: "0.3" memory: "1Gi" - # limits: - # cpu: "0.3" - # memory: "2Gi" etcd: resources: requests: cpu: "0.1" memory: "100Mi" - # limits: - # cpu: "0.1" - # memory: "300Mi" minio: resources: requests: cpu: "0.3" memory: "512Mi" - # limits: - # cpu: "0.6" - # memory: "512Mi" standalone: persistence: persistentVolumeClaim: @@ -181,6 +131,3 @@ standalone: requests: cpu: "1" memory: "3.5Gi" - # limits: - # cpu: "2.6" - # memory: "8.5Gi" diff --git a/tests/scripts/values/qa/pr.yaml b/tests/scripts/values/qa/pr.yaml index a130353bd7..b075a0807b 100644 --- a/tests/scripts/values/qa/pr.yaml +++ b/tests/scripts/values/qa/pr.yaml @@ -1,102 +1,69 @@ metrics: serviceMonitor: enabled: true - interval: "5s" - scrapeTimeout: "5s" proxy: resources: requests: cpu: "0.3" memory: "256Mi" - # limits: - # cpu: "0.5" - # memory: "512Mi" + rootCoordinator: resources: requests: cpu: "0.3" memory: "256Mi" - # limits: - # cpu: "0.6" - # memory: "512Mi" + queryCoordinator: resources: requests: cpu: "0.4" memory: "100Mi" - # limits: - # cpu: "1.1" - # memory: "256Mi" queryNode: resources: requests: cpu: "2" memory: "500Mi" - limits: - # cpu: "2" - # memory: "1.5Gi" indexCoordinator: resources: requests: cpu: "0.1" memory: "50Mi" - # limits: - # cpu: "0.1" - # memory: "100Mi" indexNode: resources: requests: cpu: "4" memory: "500Mi" - # limits: - # cpu: "4" - # memory: "1.5Gi" dataCoordinator: resources: requests: cpu: "0.1" memory: "50Mi" - # limits: - # cpu: "0.2" - # memory: "100Mi" dataNode: resources: requests: cpu: "0.5" memory: "500Mi" - # limits: - # cpu: "1.2" - # memory: "1.5Gi" pulsar: proxy: resources: requests: cpu: "1" memory: "2Gi" - # limits: - # cpu: "1" - # memory: "4Gi" # Resources for the websocket proxy wsResources: requests: memory: "512Mi" cpu: "0.3" - # limits: - # memory: "512Mi" - # cpu: "0.3" broker: resources: requests: cpu: "1.5" memory: "4Gi" - # limits: - # cpu: "1.5" - # memory: "8Gi" bookkeeper: volumes: ledgers: @@ -105,25 +72,18 @@ pulsar: requests: cpu: 1 memory: "4Gi" - # limits: - # cpu: 1 - # memory: "8Gi" bastion: resources: requests: cpu: "0.3" memory: "50Mi" - # limits: - # cpu: "0.3" - # memory: "50Mi" + autorecovery: resources: requests: cpu: "1" memory: "512Mi" - # limits: - # cpu: "1" - # memory: "1Gi" + zookeeper: volumes: data: @@ -132,30 +92,20 @@ pulsar: requests: cpu: "0.3" memory: "1Gi" - # limits: - # cpu: "0.3" - # memory: "2Gi" etcd: resources: requests: cpu: "0.1" memory: "100Mi" - # limits: - # cpu: "0.1" - # memory: "300Mi" + minio: resources: requests: cpu: "0.3" memory: "512Mi" - # limits: - # cpu: "0.6" - # memory: "512Mi" + standalone: resources: requests: cpu: "1" memory: "3.5Gi" - # limits: - # cpu: "2.6" - # memory: "8.5Gi" \ No newline at end of file