Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dashboard lib #12512

Merged
merged 5 commits into from
Mar 20, 2024
Merged

Merge dashboard lib #12512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c169f5e
change dashboard module path
skudasov Mar 20, 2024
8145bb0
Merge remote-tracking branch 'origin/develop' into develop
skudasov Mar 20, 2024
43177ac
Merge remote-tracking branch 'origin/develop' into develop
skudasov Mar 20, 2024
e3412e3
dashboard lib
skudasov Mar 20, 2024
7d53abe
fix go mod
skudasov Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/chainlink-cluster/dashboard/cmd/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package main

import (
"github.com/K-Phoen/grabana/dashboard"
lib "github.com/smartcontractkit/chainlink/dashboard-lib/lib"
core_don "github.com/smartcontractkit/chainlink/dashboard-lib/lib/core-don"
k8spods "github.com/smartcontractkit/chainlink/dashboard-lib/lib/k8s-pods"
lib "github.com/smartcontractkit/chainlink/dashboard-lib"
core_don "github.com/smartcontractkit/chainlink/dashboard-lib/core-don"
k8spods "github.com/smartcontractkit/chainlink/dashboard-lib/k8s-pods"
waspdb "github.com/smartcontractkit/wasp/dashboard"
)

Expand Down
4 changes: 2 additions & 2 deletions charts/chainlink-cluster/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21.7

require (
github.com/K-Phoen/grabana v0.22.1
github.com/smartcontractkit/chainlink/dashboard-lib v0.22.1
github.com/smartcontractkit/chainlink/dashboard-lib v0.0.0-00010101000000-000000000000
github.com/smartcontractkit/wasp v0.4.6
)

Expand Down Expand Up @@ -34,5 +34,5 @@ replace (
github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f

github.com/sercand/kuberesolver/v4 => github.com/sercand/kuberesolver/v5 v5.1.1
github.com/smartcontractkit/chainlink/dashboard-lib => ../../dashboard
github.com/smartcontractkit/chainlink/dashboard-lib => ../../dashboard-lib
)
2 changes: 1 addition & 1 deletion dashboard/README.md → dashboard-lib/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Components should be imported from this module, see [example](../charts/chainlin
## How to convert from JSON using Grabana codegen utility
1. Download Grabana binary [here](https://github.com/K-Phoen/grabana/releases)
2. ./bin/grabana convert-go -i dashboard.json > lib/my_new_component/rows.go
3. Create a [component](lib/k8s-pods/component.go)
3. Create a [component](k8s-pods/component.go)
0 ...oard/lib/ccip-load-test-view/component.go → ...oard-lib/ccip-load-test-view/component.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion dashboard/lib/config.go → dashboard-lib/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dashboardlib
package dashboard_lib

import "os"

Expand Down
0 dashboard/lib/core-don/component.go → dashboard-lib/core-don/component.go
View file
Open in desktop
File renamed without changes.
0 dashboard/lib/core-don/platform.go → dashboard-lib/core-don/platform.go
View file
Open in desktop
File renamed without changes.
0 dashboard/lib/core-ocrv2-ccip/component.go → dashboard-lib/core-ocrv2-ccip/component.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion dashboard/lib/dashboard.go → dashboard-lib/dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dashboardlib
package dashboard_lib

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion dashboard/go.mod → dashboard-lib/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/smartcontractkit/chainlink/v2/dashboard-lib
module github.com/smartcontractkit/chainlink/dashboard-lib

go 1.21.7

Expand Down
0 dashboard/go.sum → dashboard-lib/go.sum
View file
Open in desktop
File renamed without changes.
0 dashboard/lib/k8s-pods/component.go → dashboard-lib/k8s-pods/component.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion dashboard/lib/log.go → dashboard-lib/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dashboardlib
package dashboard_lib

import (
"os"
Expand Down
Loading