Merge branch 'main' into dk/ccip-multiramps

smartcontractkit · Jun 18, 2024 · f22f791 · f22f791
2 parents ac191e7 + 2867080
commit f22f791
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 3 deletions.
diff --git a/observability-lib/cmd/deploy.go b/observability-lib/cmd/deploy.go
@@ -37,7 +37,7 @@ var DeployCmd = &cobra.Command{
 		case "core-node":
 			builder, err = corenode.BuildDashboard(name, dataSourcesType.Metrics, platform)
 		case "core-node-components":
-			builder, err = corenodecomponents.BuildDashboard(name, dataSourcesType.Metrics)
+			builder, err = corenodecomponents.BuildDashboard(name, dataSourcesType.Metrics, dataSourcesType.Logs)
 		case "core-node-resources":
 			builder, err = k8sresources.BuildDashboard(name, dataSourcesType.Metrics, dataSourcesType.Logs)
 		case "ocr":

diff --git a/observability-lib/cmd/generate.go b/observability-lib/cmd/generate.go
@@ -36,7 +36,7 @@ var GenerateCmd = &cobra.Command{
 		case "core-node":
 			builder, err = corenode.BuildDashboard(name, dataSourcesType.Metrics, platform)
 		case "core-node-components":
-			builder, err = corenodecomponents.BuildDashboard(name, dataSourcesType.Metrics)
+			builder, err = corenodecomponents.BuildDashboard(name, dataSourcesType.Metrics, dataSourcesType.Logs)
 		case "core-node-resources":
 			builder, err = k8sresources.BuildDashboard(name, dataSourcesType.Metrics, dataSourcesType.Logs)
 		case "ocr":

diff --git a/observability-lib/core-node-components/component.go b/observability-lib/core-node-components/component.go
@@ -9,9 +9,10 @@ import (
 	"github.com/smartcontractkit/chainlink-common/observability-lib/utils"
 )
 
-func BuildDashboard(name string, dataSourceMetric string) (dashboard.Dashboard, error) {
+func BuildDashboard(name string, dataSourceMetric string, dataSourceLog string) (dashboard.Dashboard, error) {
 	props := Props{
 		MetricsDataSource: dataSourceMetric,
+		LogsDataSource:    dataSourceLog,
 		PlatformOpts:      PlatformPanelOpts(),
 	}
 
@@ -140,5 +141,17 @@ func panelsGeneralInfo(p Props) []cog.Builder[dashboard.Panel] {
 		},
 	).Min(0).Max(100))
 
+	panelsArray = append(panelsArray, utils.LogPanel(
+		p.LogsDataSource,
+		"Logs with severity >= error",
+		"",
+		6,
+		24,
+		utils.PrometheusQuery{
+			Query:  `{env="${env}", cluster="${cluster}", product="${product}", network_type="${network_type}", instance=~"${service}"} | json | level=~"(error|panic|fatal|crit)"`,
+			Legend: "",
+		},
+	))
+
 	return panelsArray
 }
diff --git a/observability-lib/core-node-components/platform.go b/observability-lib/core-node-components/platform.go
@@ -11,6 +11,7 @@ type PlatformOpts struct {
 
 type Props struct {
 	MetricsDataSource string
+	LogsDataSource    string
 	PlatformOpts      PlatformOpts
 }
 

diff --git a/observability-lib/utils/common.go b/observability-lib/utils/common.go
@@ -5,6 +5,7 @@ import (
 	"github.com/grafana/grafana-foundation-sdk/go/common"
 	"github.com/grafana/grafana-foundation-sdk/go/dashboard"
 	"github.com/grafana/grafana-foundation-sdk/go/gauge"
+	"github.com/grafana/grafana-foundation-sdk/go/logs"
 	"github.com/grafana/grafana-foundation-sdk/go/prometheus"
 	"github.com/grafana/grafana-foundation-sdk/go/stat"
 	"github.com/grafana/grafana-foundation-sdk/go/table"
@@ -189,3 +190,25 @@ func TablePanel(
 
 	return panel
 }
+
+func LogPanel(
+	datasource string,
+	title string,
+	description string,
+	height uint32,
+	span uint32,
+	query ...PrometheusQuery,
+) *logs.PanelBuilder {
+	panel := logs.NewPanelBuilder().
+		Datasource(datasourceRef(datasource)).
+		Height(height).
+		Span(span).
+		Title(title).
+		Description(description)
+
+	for _, q := range query {
+		panel.WithTarget(prometheusQuery(q.Query, q.Legend))
+	}
+
+	return panel
+}