diff --git a/test/e2e-v2/cases/kafka/meter/docker-compose.yml b/test/e2e-v2/cases/kafka/meter/docker-compose.yml index f008442974..8c28a3c910 100644 --- a/test/e2e-v2/cases/kafka/meter/docker-compose.yml +++ b/test/e2e-v2/cases/kafka/meter/docker-compose.yml @@ -108,11 +108,6 @@ services: SW_AGENT_INSTANCE_NAME: provider1 SW_LOGGING_OUTPUT: CONSOLE SW_METER_REPORT_INTERVAL: 5 - healthcheck: - test: ["CMD", "sh", "-c", "nc -nz 127.0.0.1 9090"] - interval: 5s - timeout: 60s - retries: 120 depends_on: oap: condition: service_healthy diff --git a/test/e2e-v2/cases/kafka/meter/expected/service-instance.yml b/test/e2e-v2/cases/kafka/meter/expected/service-instance.yml index d862e0c3a0..3faba6ee31 100644 --- a/test/e2e-v2/cases/kafka/meter/expected/service-instance.yml +++ b/test/e2e-v2/cases/kafka/meter/expected/service-instance.yml @@ -25,7 +25,7 @@ - name: hostname value: {{ notEmpty .value }} - name: Process No. - value: "1" + value: {{ notEmpty .value }} - name: Start Time value: {{ notEmpty .value }} - name: JVM Arguments diff --git a/test/e2e-v2/cases/kafka/profile/docker-compose.yml b/test/e2e-v2/cases/kafka/profile/docker-compose.yml index df34aae9fe..4cee42c958 100644 --- a/test/e2e-v2/cases/kafka/profile/docker-compose.yml +++ b/test/e2e-v2/cases/kafka/profile/docker-compose.yml @@ -122,11 +122,6 @@ services: SW_AGENT_INSTANCE_NAME: provider1 SW_LOGGING_OUTPUT: CONSOLE SW_METER_REPORT_INTERVAL: 5 - healthcheck: - test: ["CMD", "sh", "-c", "nc -nz 127.0.0.1 9090"] - interval: 5s - timeout: 60s - retries: 120 depends_on: oap: condition: service_healthy diff --git a/test/e2e-v2/cases/kafka/simple-so11y/docker-compose.yml b/test/e2e-v2/cases/kafka/simple-so11y/docker-compose.yml index 85e043a6dc..be85b5694c 100644 --- a/test/e2e-v2/cases/kafka/simple-so11y/docker-compose.yml +++ b/test/e2e-v2/cases/kafka/simple-so11y/docker-compose.yml @@ -109,7 +109,7 @@ services: SW_AGENT_INSTANCE_NAME: provider1 SW_LOGGING_OUTPUT: CONSOLE healthcheck: - test: ["CMD", "sh", "-c", "nc -nz 127.0.0.1 9090"] + test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9090"] interval: 5s timeout: 60s retries: 120 diff --git a/test/e2e-v2/cases/profile/expected/service-instance.yml b/test/e2e-v2/cases/profile/expected/service-instance.yml index d862e0c3a0..3faba6ee31 100644 --- a/test/e2e-v2/cases/profile/expected/service-instance.yml +++ b/test/e2e-v2/cases/profile/expected/service-instance.yml @@ -25,7 +25,7 @@ - name: hostname value: {{ notEmpty .value }} - name: Process No. - value: "1" + value: {{ notEmpty .value }} - name: Start Time value: {{ notEmpty .value }} - name: JVM Arguments diff --git a/test/e2e-v2/cases/satellite/native-protocols/expected/service-instance.yml b/test/e2e-v2/cases/satellite/native-protocols/expected/service-instance.yml index 0ec1a99e2e..b73fc10a72 100644 --- a/test/e2e-v2/cases/satellite/native-protocols/expected/service-instance.yml +++ b/test/e2e-v2/cases/satellite/native-protocols/expected/service-instance.yml @@ -25,7 +25,7 @@ - name: hostname value: {{ notEmpty .value }} - name: Process No. - value: "1" + value: {{ notEmpty .value }} - name: Start Time value: {{ notEmpty .value }} - name: JVM Arguments diff --git a/test/e2e-v2/cases/simple/expected/service-instance-consumer.yml b/test/e2e-v2/cases/simple/expected/service-instance-consumer.yml index 9b5f754f54..eda2d9d07e 100644 --- a/test/e2e-v2/cases/simple/expected/service-instance-consumer.yml +++ b/test/e2e-v2/cases/simple/expected/service-instance-consumer.yml @@ -25,7 +25,7 @@ - name: hostname value: {{ notEmpty .value }} - name: Process No. - value: "1" + value: {{ notEmpty .value }} - name: Start Time value: {{ notEmpty .value }} - name: JVM Arguments diff --git a/test/e2e-v2/cases/simple/expected/service-instance-provider.yml b/test/e2e-v2/cases/simple/expected/service-instance-provider.yml index d862e0c3a0..3faba6ee31 100644 --- a/test/e2e-v2/cases/simple/expected/service-instance-provider.yml +++ b/test/e2e-v2/cases/simple/expected/service-instance-provider.yml @@ -25,7 +25,7 @@ - name: hostname value: {{ notEmpty .value }} - name: Process No. - value: "1" + value: {{ notEmpty .value }} - name: Start Time value: {{ notEmpty .value }} - name: JVM Arguments