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

Jump to bottom

Make changes to run cli from the appscode/grafana-dashboards CI #766

Merged
merged 9 commits into from
Jul 17, 2024
Merged

Make changes to run cli from the appscode/grafana-dashboards CI #766

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
97b922f
Add: fatal if cli give negatvie result
sayedppqq May 14, 2024
bff8d94
new dbs add in dashboard check
sayedppqq May 16, 2024
db2ba94
non db mood added
sayedppqq May 17, 2024
f121bc6
resolved
sayedppqq May 23, 2024
4ca04ed
Add gvk for connectcluster
sayedppqq May 24, 2024
61fe0eb
for test
sayedppqq Jun 6, 2024
91721c0
Naming convention
sayedppqq Jul 4, 2024
a4d6eff
remove test code
sayedppqq Jul 4, 2024
6cd064c
rebased
sayedppqq Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
new dbs add in dashboard check 
Signed-off-by: sayedppqq <[email protected]>
  • Loading branch information
@sayedppqq
sayedppqq committed Jul 16, 2024
commit bff8d94f29811600aebe2ea67342e8cf96b26523
21 changes: 21 additions & 0 deletions pkg/cmds/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,22 @@ var alertExample = templates.Examples(`
--prom-svc-name=prometheus-kube-prometheus-prometheus --prom-svc-namespace=monitoring --prom-svc-port=9090

Valid resource types include:
* connectcluster
* druid
* elasticsearch
* kafka
* mariadb
* mongodb
* mysql
* perconaxtradb
* pgpool
* postgres
* proxysql
* rabbitmq
* redis
* singlestore
* solr
* zookeeper
`)

func AlertCMD(f cmdutil.Factory) *cobra.Command {
Expand Down Expand Up @@ -131,15 +138,22 @@ var dashboardExample = templates.Examples(`
--prom-svc-name=prometheus-kube-prometheus-prometheus --prom-svc-namespace=monitoring --prom-svc-port=9090

Valid dashboards include:
* connectcluster
* druid
* elasticsearch
* kafka
* mariadb
* mongodb
* mysql
* perconaxtradb
* pgpool
* postgres
* proxysql
* rabbitmq
* redis
* singlestore
* solr
* zookeeper

If --file is given, that is the local file. absolute or relative path both accepted.
If --url is given, that is the remote file. You have to specify the full raw url.
Expand Down Expand Up @@ -186,15 +200,22 @@ var connectionExample = templates.Examples(`
--prom-svc-name=prometheus-kube-prometheus-prometheus --prom-svc-namespace=monitoring --prom-svc-port=9090

Valid resource types include:
* connectcluster
* druid
* elasticsearch
* kafka
* mariadb
* mongodb
* mysql
* perconaxtradb
* pgpool
* postgres
* proxysql
* rabbitmq
* redis
* singlestore
* solr
* zookeeper
`)

func ConnectionCMD(f cmdutil.Factory) *cobra.Command {
Expand Down
30 changes: 30 additions & 0 deletions pkg/monitor/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,18 @@ import (
"strings"

api "kubedb.dev/apimachinery/apis/kubedb/v1"
kapi "kubedb.dev/apimachinery/apis/kafka/v1alpha1"
api "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
)

func ConvertedResourceToPlural(resource string) string {
// standardizing the resource name
res := strings.ToLower(resource)
switch res {
case kapi.ResourceCodeConnectCluster, kapi.ResourcePluralConnectCluster, kapi.ResourceSingularConnectCluster:
res = kapi.ResourcePluralConnectCluster
case api.ResourceCodeDruid, api.ResourcePluralDruid, api.ResourceSingularDruid:
res = api.ResourcePluralDruid
case api.ResourceCodeElasticsearch, api.ResourcePluralElasticsearch, api.ResourceSingularElasticsearch:
res = api.ResourcePluralElasticsearch
case api.ResourceCodeKafka, api.ResourcePluralKafka, api.ResourceSingularKafka:
Expand All @@ -39,12 +45,22 @@ func ConvertedResourceToPlural(resource string) string {
res = api.ResourcePluralMySQL
case api.ResourceCodePerconaXtraDB, api.ResourcePluralPerconaXtraDB, api.ResourceSingularPerconaXtraDB:
res = api.ResourcePluralPerconaXtraDB
case api.ResourceCodePgpool, api.ResourcePluralPgpool, api.ResourceSingularPgpool:
res = api.ResourcePluralPgpool
case api.ResourceCodePostgres, api.ResourcePluralPostgres, api.ResourceSingularPostgres:
res = api.ResourcePluralPostgres
case api.ResourceCodeProxySQL, api.ResourcePluralProxySQL, api.ResourceSingularProxySQL:
res = api.ResourcePluralProxySQL
case api.ResourceCodeRabbitmq, api.ResourcePluralRabbitmq, api.ResourceSingularRabbitmq:
res = api.ResourcePluralRabbitmq
case api.ResourceCodeRedis, api.ResourcePluralRedis, api.ResourceSingularRedis:
res = api.ResourcePluralRedis
case api.ResourceCodeSinglestore, api.ResourcePluralSinglestore, api.ResourceSingularSinglestore:
res = api.ResourcePluralSinglestore
case api.ResourceCodeSolr, api.ResourcePluralSolr, api.ResourceSingularSolr:
res = api.ResourcePluralSolr
case api.ResourceCodeZooKeeper, api.ResourcePluralZooKeeper, api.ResourceSingularZooKeeper:
res = api.ResourcePluralZooKeeper
default:
log.Fatalf("%s is not a valid resource type \n", resource)
}
Expand All @@ -55,6 +71,10 @@ func ConvertedResourceToSingular(resource string) string {
// standardizing the resource name
res := strings.ToLower(resource)
switch res {
case kapi.ResourceCodeConnectCluster, kapi.ResourcePluralConnectCluster, kapi.ResourceSingularConnectCluster:
res = kapi.ResourceSingularConnectCluster
case api.ResourceCodeDruid, api.ResourcePluralDruid, api.ResourceSingularDruid:
res = api.ResourceSingularDruid
case api.ResourceCodeElasticsearch, api.ResourcePluralElasticsearch, api.ResourceSingularElasticsearch:
res = api.ResourceSingularElasticsearch
case api.ResourceCodeKafka, api.ResourcePluralKafka, api.ResourceSingularKafka:
Expand All @@ -67,12 +87,22 @@ func ConvertedResourceToSingular(resource string) string {
res = api.ResourceSingularMySQL
case api.ResourceCodePerconaXtraDB, api.ResourcePluralPerconaXtraDB, api.ResourceSingularPerconaXtraDB:
res = api.ResourceSingularPerconaXtraDB
case api.ResourceCodePgpool, api.ResourcePluralPgpool, api.ResourceSingularPgpool:
res = api.ResourceSingularPgpool
case api.ResourceCodePostgres, api.ResourcePluralPostgres, api.ResourceSingularPostgres:
res = api.ResourceSingularPostgres
case api.ResourceCodeProxySQL, api.ResourcePluralProxySQL, api.ResourceSingularProxySQL:
res = api.ResourceSingularProxySQL
case api.ResourceCodeRabbitmq, api.ResourcePluralRabbitmq, api.ResourceSingularRabbitmq:
res = api.ResourceSingularRabbitmq
case api.ResourceCodeRedis, api.ResourcePluralRedis, api.ResourceSingularRedis:
res = api.ResourceSingularRedis
case api.ResourceCodeSinglestore, api.ResourcePluralSinglestore, api.ResourceSingularSinglestore:
res = api.ResourceSingularSinglestore
case api.ResourceCodeSolr, api.ResourcePluralSolr, api.ResourceSingularSolr:
res = api.ResourceSingularSolr
case api.ResourceCodeZooKeeper, api.ResourcePluralZooKeeper, api.ResourceSingularZooKeeper:
res = api.ResourceSingularZooKeeper
default:
log.Fatalf("%s is not a valid resource type \n", resource)
}
Expand Down