Skip to content

Commit 2569020

Browse files
committed
Merge branch 'main' of https://github.com/smartcontractkit/chainlink-common into PLEX-1460-delivery-acks
2 parents 624fe53 + 3688afc commit 2569020

File tree

17 files changed

+863
-219
lines changed

17 files changed

+863
-219
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
# Please define less specific codeowner paths before more specific codeowner paths in order for the more specific rule to have priority
66

7+
78
* @smartcontractkit/foundations
89

10+
/keystore @smartcontractkit/prodsec-public @smartcontractkit/foundations
911
/pkg/beholder/ @smartcontractkit/data-tooling
1012
/pkg/capabilities/v2/chain-capabilities @smartcontractkit/keystone @smartcontractkit/capabilities-team @smartcontractkit/bix-framework
1113
/pkg/chains/evm @smartcontractkit/bix-framework

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ require (
3030
github.com/kylelemons/godebug v1.1.0
3131
github.com/lib/pq v1.10.9
3232
github.com/marcboeker/go-duckdb v1.8.5
33+
github.com/mattn/go-shellwords v1.0.12
3334
github.com/mr-tron/base58 v1.2.0
3435
github.com/pelletier/go-toml v1.9.5
3536
github.com/pelletier/go-toml/v2 v2.2.4

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
256256
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
257257
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
258258
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
259+
github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
260+
github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
259261
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
260262
github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
261263
github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=

observability-lib/grafana/datasource.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package grafana
22

3-
import "github.com/smartcontractkit/chainlink-common/observability-lib/api"
3+
import (
4+
"errors"
5+
6+
"github.com/smartcontractkit/chainlink-common/observability-lib/api"
7+
)
48

59
type DataSource struct {
610
ID uint
@@ -26,6 +30,9 @@ func GetDataSourceFromGrafana(name string, grafanaURL string, grafanaToken strin
2630
if err != nil {
2731
return nil, err
2832
}
33+
if datasource.Name == "" {
34+
return nil, errors.New("unexpected empty response. please check connection or vpn settings")
35+
}
2936

3037
return &DataSource{ID: datasource.ID, Name: datasource.Name, UID: datasource.UID, Type: datasource.Type}, nil
3138
}

0 commit comments

Comments
 (0)