Merge branch 'main' into jd-better-health-check

Author: Tofel

book/src/framework/chaos/chaos.md

@@ -58,8 +58,32 @@ We also offer a set of blockchain-specific experiments, which typically involve
 
 Check [gas](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/framework/examples/myproject/chaos/chaos_blockchain_evm_gas_test.go) and [reorg](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/framework/examples/myproject/chaos/chaos_blockchain_evm_reorg_test.go) examples, the same example work for [K8s](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/framework/examples/myproject/chaos/chaos_k8s_test.go).
 
-## Debugging
+## Debugging and Developing Chaos Suites
 
-To debug `Docker` applications you can just use `CTFv2` deployments.
+To debug `Docker` applications you can just use `CTFv2` deployments and Docker logs.
 
 To debug `K8s` please use our [simulator](../chaos/debug-k8s.md).
+
+The simplest way to start is to spin up the simulator and run `K8s` tests:
+```
+cd infra/chaosmesh-playground
+devbox run up
+k9s
+```
+Then go to `default` namespace and check which example pods we have, run the tests
+```
+cd framework/examples/myproject/chaos
+CTF_CONFIGS=chaos_k8s.toml go test -v -run TestK8sChaos
+```
+Reorg and gas tests will fail and that's fine, you should run them on a real `Geth` deployment.
+
+Grafana's annotations required `GRAFANA_URL` environment variable to be set
+```
+export GRAFANA_URL=...
+export GRAFANA_TOKEN=...
+```
+If you want CRDs to stay use `remove_k8s_chaos` flag in `chaos-k8s.toml`
+```
+    remove_k8s_chaos = false
+```
+Then search for `:podchaos` and `:networkchaos` in `k9s` to inspect the CRDs

framework/.changeset/v0.11.3.md

@@ -1 +1 @@
-- Enhance JD health checks and add a CI test for it
+- Bump the Aptos node image to v1.36.6

framework/.changeset/v0.11.4.md

@@ -0,0 +1 @@
+- Fix failing node logs in OTel collector when enabled logs streaming

framework/.changeset/v0.11.5.md

@@ -0,0 +1 @@
+- Enhance JD health checks and add a CI test for it

framework/components/blockchain/aptos.go

@@ -17,8 +17,8 @@ import (
 const (
 	DefaultAptosAPIPort     = "8080"
 	DefaultAptosFaucetPort  = "8081"
-	DefaultAptosArm64Image  = "ghcr.io/friedemannf/aptos-tools:aptos-node-v1.34.3-hotfix"
-	DefaultAptosX86_64Image = "aptoslabs/tools:aptos-node-v1.34.3-hotfix"
+	DefaultAptosArm64Image  = "ghcr.io/friedemannf/aptos-tools:aptos-node-v1.36.6"
+	DefaultAptosX86_64Image = "aptoslabs/tools:aptos-node-v1.36.6"
 )
 
 var (

framework/examples/myproject/chaos/chaos_k8s.toml

@@ -1,12 +1,12 @@
 [chaos]
-wait_before_start = "10s"
-namespace = "default"
-dashboard_uuids = ["WaspDebug"]
-experiment_duration = "20s"
-experiment_injection_duration = "10s"
-remove_k8s_chaos = true
-
-blockchain_http_urls = ["http://localhost:8545", "http://localhost:8550"]
-reorg_below_finality_threshold = 5
-reorg_above_finality_threshold = 10
-block_every = "1s"
+    wait_before_start = "10s"
+    namespace = "default"
+    dashboard_uuids = ["WaspDebug"]
+    experiment_duration = "20s"
+    experiment_injection_duration = "10s"
+    remove_k8s_chaos = false
+    
+    blockchain_http_urls = ["http://localhost:8545", "http://localhost:8550"]
+    reorg_below_finality_threshold = 5
+    reorg_above_finality_threshold = 10
+    block_every = "1s"