set all URLs to 15m/5s refresh, fix shadowed error in DefaultNetwork

Author: skudasov

framework/.changeset/v0.10.1.md

@@ -0,0 +1,3 @@
+- Expose observability stack functions to reuse in devenv repository
+- Set all dashboard URLs to 15m/5s
+- Add config functions compatible with devenv

framework/cmd/main.go

@@ -115,7 +115,7 @@ func main() {
 						Aliases:     []string{"u"},
 						Description: "Spins up Blockscout stack",
 						Action: func(c *cli.Context) error {
-							return framework.BlockscoutUp(c.String("rpc"))
+							return framework.BlockScoutUp(c.String("rpc"))
 						},
 					},
 					{
@@ -124,7 +124,7 @@ func main() {
 						Aliases:     []string{"d"},
 						Description: "Removes Blockscout stack, wipes all Blockscout databases data",
 						Action: func(c *cli.Context) error {
-							return framework.BlockscoutDown(c.String("rpc"))
+							return framework.BlockScoutDown(c.String("rpc"))
 						},
 					},
 					{
@@ -134,10 +134,10 @@ func main() {
 						Description: "Reboots Blockscout stack",
 						Action: func(c *cli.Context) error {
 							rpc := c.String("rpc")
-							if err := framework.BlockscoutDown(rpc); err != nil {
+							if err := framework.BlockScoutDown(rpc); err != nil {
 								return err
 							}
-							return framework.BlockscoutUp(rpc)
+							return framework.BlockScoutUp(rpc)
 						},
 					},
 				},

framework/config.go

@@ -224,6 +224,7 @@ func LoadCache[X any](t *testing.T) (*X, error) {
 	return Load[X](t)
 }
 
+// BaseConfigPath returns base config path, ex. env.toml,overrides.toml -> env.toml
 func BaseConfigPath() (string, error) {
 	configs := os.Getenv("CTF_CONFIGS")
 	if configs == "" {
@@ -233,6 +234,7 @@ func BaseConfigPath() (string, error) {
 	return strings.Split(configs, ",")[0], nil
 }
 
+// BaseConfigName returns base config name, ex. env.toml -> env
 func BaseConfigName() (string, error) {
 	cp, err := BaseConfigPath()
 	if err != nil {
@@ -241,6 +243,7 @@ func BaseConfigName() (string, error) {
 	return strings.Replace(cp, ".toml", "", -1), nil
 }
 
+// BaseCacheName returns base cache file name, ex.: env.toml -> env-cache.toml
 func BaseCacheName() (string, error) {
 	cp, err := BaseConfigPath()
 	if err != nil {
@@ -252,15 +255,17 @@ func BaseCacheName() (string, error) {
 
 func DefaultNetwork(once *sync.Once) error {
 	var net *testcontainers.DockerNetwork
-	var err error
+	var innerErr error
 	once.Do(func() {
-		net, err = network.New(
+		net, innerErr = network.New(
 			context.Background(),
 			network.WithLabels(map[string]string{"framework": "ctf"}),
 		)
-		DefaultNetworkName = net.Name
+		if innerErr == nil {
+			DefaultNetworkName = net.Name
+		}
 	})
-	return err
+	return innerErr
 }
 
 func RenderTemplate(tmpl string, data interface{}) (string, error) {

framework/observability.go

@@ -14,11 +14,11 @@ var EmbeddedObservabilityFiles embed.FS
 
 const (
 	LocalCLNodeErrorsURL   = "http://localhost:3000/d/a7de535b-3e0f-4066-bed7-d505b6ec9ef1/cl-node-errors?orgId=1&refresh=5s"
-	LocalWorkflowEngineURL = "http://localhost:3000/d/ce589a98-b4be-4f80-bed1-bc62f3e4414a/workflow-engine?orgId=1&refresh=5s"
-	LocalLogsURL           = "http://localhost:3000/explore?panes=%7B%22qZw%22:%7B%22datasource%22:%22P8E80F9AEF21F6940%22,%22queries%22:%5B%7B%22refId%22:%22A%22,%22expr%22:%22%22,%22queryType%22:%22range%22,%22datasource%22:%7B%22type%22:%22loki%22,%22uid%22:%22P8E80F9AEF21F6940%22%7D%7D%5D,%22range%22:%7B%22from%22:%22now-15m%22,%22to%22:%22now%22%7D%7D%7D&schemaVersion=1&orgId=1"
-	LocalPrometheusURL     = "http://localhost:3000/explore?panes=%7B%22qZw%22:%7B%22datasource%22:%22PBFA97CFB590B2093%22,%22queries%22:%5B%7B%22refId%22:%22A%22,%22expr%22:%22%22,%22range%22:true,%22datasource%22:%7B%22type%22:%22prometheus%22,%22uid%22:%22PBFA97CFB590B2093%22%7D%7D%5D,%22range%22:%7B%22from%22:%22now-6h%22,%22to%22:%22now%22%7D%7D%7D&schemaVersion=1&orgId=1"
-	LocalPostgresDebugURL  = "http://localhost:3000/d/000000039/postgresql-database?orgId=1&refresh=10s&var-DS_PROMETHEUS=PBFA97CFB590B2093&var-interval=$__auto_interval_interval&var-namespace=&var-release=&var-instance=postgres_exporter_0:9187&var-datname=All&var-mode=All&from=now-5m&to=now"
-	LocalPyroScopeURL      = "http://localhost:4040"
+	LocalWorkflowEngineURL = "http://localhost:3000/d/ce589a98-b4be-4f80-bed1-bc62f3e4414a/workflow-engine?orgId=1&refresh=5s&from=now-15m&to=now"
+	LocalLogsURL           = "http://localhost:3000/explore?panes=%7B%22qZw%22:%7B%22datasource%22:%22P8E80F9AEF21F6940%22,%22queries%22:%5B%7B%22refId%22:%22A%22,%22expr%22:%22%7Bjob%3D%5C%22ctf%5C%22%7D%22,%22queryType%22:%22range%22,%22datasource%22:%7B%22type%22:%22loki%22,%22uid%22:%22P8E80F9AEF21F6940%22%7D,%22editorMode%22:%22code%22%7D%5D,%22range%22:%7B%22from%22:%22now-15m%22,%22to%22:%22now%22%7D%7D%7D&schemaVersion=1&orgId=1"
+	LocalPrometheusURL     = "http://localhost:3000/explore?panes=%7B%22qZw%22:%7B%22datasource%22:%22PBFA97CFB590B2093%22,%22queries%22:%5B%7B%22refId%22:%22A%22,%22expr%22:%22%22,%22range%22:true,%22datasource%22:%7B%22type%22:%22prometheus%22,%22uid%22:%22PBFA97CFB590B2093%22%7D%7D%5D,%22range%22:%7B%22from%22:%22now-15m%22,%22to%22:%22now%22%7D%7D%7D&schemaVersion=1&orgId=1"
+	LocalPostgresDebugURL  = "http://localhost:3000/d/000000039/postgresql-database?orgId=1&refresh=5s&var-DS_PROMETHEUS=PBFA97CFB590B2093&var-interval=$__auto_interval_interval&var-namespace=&var-release=&var-instance=postgres_exporter_0:9187&var-datname=All&var-mode=All&from=now-15m&to=now"
+	LocalPyroScopeURL      = "http://localhost:4040/?query=process_cpu%3Acpu%3Ananoseconds%3Acpu%3Ananoseconds%7Bservice_name%3D%22chainlink-node%22%7D&from=now-15m"
 )
 
 // extractAllFiles goes through the embedded directory and extracts all files to the current directory
@@ -75,7 +75,7 @@ func extractAllFiles(embeddedDir string) error {
 	return err
 }
 
-func BlockscoutUp(url string) error {
+func BlockScoutUp(url string) error {
 	L.Info().Msg("Creating local Blockscout stack")
 	if err := extractAllFiles("observability"); err != nil {
 		return err
@@ -93,7 +93,7 @@ func BlockscoutUp(url string) error {
 	return nil
 }
 
-func BlockscoutDown(url string) error {
+func BlockScoutDown(url string) error {
 	L.Info().Msg("Removing local Blockscout stack")
 	os.Setenv("BLOCKSCOUT_RPC_URL", url)
 	err := RunCommand("bash", "-c", fmt.Sprintf(`