Disable monitoring for booted Cloud instances

vaticle · Mar 23, 2024 · 5932aad · 5932aad
1 parent 8a1cac5
commit 5932aad
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/java/test/behaviour/connection/ConnectionStepsBase.java b/java/test/behaviour/connection/ConnectionStepsBase.java
@@ -65,7 +65,7 @@ public abstract class ConnectionStepsBase {
     public static final Map<String, String> serverOptions = map(
             pair("--diagnostics.reporting.errors", "false"),
             pair("--diagnostics.reporting.statistics", "false"),
-            pair("--diagnostics.monitoring.monitoring", "false")
+            pair("--diagnostics.monitoring.enable", "false")
     );
 
     public static TypeDBTransaction tx() {

diff --git a/nodejs/test/integration/test-cloud-failover.js b/nodejs/test/integration/test-cloud-failover.js
@@ -72,6 +72,8 @@ function serverStart(idx) {
         "--server.encryption.file.internal-grpc.root-ca", encryptionResourceDir + "int-grpc-root-ca.pem",
         "--server.encryption.file.internal-zmq.private-key", encryptionResourceDir + "int-zmq-private-key",
         "--server.encryption.file.internal-zmq.public-key", encryptionResourceDir + "int-zmq-public-key",
+        "--diagnostics.reporting.errors", "false",
+        "--diagnostics.monitoring.enable", "false"
     ]);
     node.stdout.on('data', (data) => {
         console.log(`stdout: ${data}`);

diff --git a/python/tests/integration/cloud_test_rule.bzl b/python/tests/integration/cloud_test_rule.bzl
@@ -47,7 +47,9 @@ def _rule_implementation(ctx):
                 --server.peers.peer-3.address=localhost:31729 \
                 --server.peers.peer-3.internal-address.zeromq=localhost:31730 \
                 --server.peers.peer-3.internal-address.grpc=localhost:31731 \
-                --server.encryption.enable=true
+                --server.encryption.enable=true \
+                --diagnostics.reporting.errors=false \
+                --diagnostics.monitoring.enable=false
             }
             if test -d typedb_distribution; then
              echo Existing distribution detected. Cleaning.

diff --git a/python/tests/integration/test_cloud_failover.py b/python/tests/integration/test_cloud_failover.py
@@ -59,7 +59,9 @@ def server_start(index):
             "--server.peers.peer-3.address", "localhost:31729",
             "--server.peers.peer-3.internal-address.zeromq", "localhost:31730",
             "--server.peers.peer-3.internal-address.grpc", "localhost:31731",
-            "--server.encryption.enable", "true"
+            "--server.encryption.enable", "true",
+            "--diagnostics.reporting.errors", "false",
+            "--diagnostics.monitoring.enable", "false"
         ])
 
     def get_primary_replica(self, database_manager: DatabaseManager):

diff --git a/tool/test/start-cloud-servers.sh b/tool/test/start-cloud-servers.sh
@@ -49,7 +49,8 @@ function server_start() {
     --server.encryption.file.internal-grpc.root-ca=`realpath tool/test/resources/encryption/int-grpc-root-ca.pem` \
     --server.encryption.file.internal-zmq.private-key=`realpath tool/test/resources/encryption/int-zmq-private-key` \
     --server.encryption.file.internal-zmq.public-key=`realpath tool/test/resources/encryption/int-zmq-public-key` \
-    --diagnostics.reporting.errors=false
+    --diagnostics.reporting.errors=false \
+    --diagnostics.monitoring.enable=false
 }
 
 rm -rf $(seq 1 $NODE_COUNT) typedb-cloud-all

diff --git a/tool/test/start-core-server.sh b/tool/test/start-core-server.sh
@@ -26,7 +26,7 @@ rm -rf typedb-all
 
 bazel run //tool/test:typedb-extractor -- typedb-all
 BAZEL_JAVA_HOME=$(bazel run //tool/test:echo-java-home)
-JAVA_HOME=$BAZEL_JAVA_HOME ./typedb-all/typedb server --diagnostics.reporting.errors=false &
+JAVA_HOME=$BAZEL_JAVA_HOME ./typedb-all/typedb server --diagnostics.reporting.errors=false --diagnostics.monitoring.enable=false &
 
 set +e
 POLL_INTERVAL_SECS=0.5