Skip to content

Breaking: add metadata_config_nodes #19

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

Merged
merged 3 commits into from
Aug 6, 2022
Merged

Breaking: add metadata_config_nodes #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b25f76
Breaking: add metadata_config_nodes
rluisr Aug 6, 2022
feaeb3c
Use latest golangci-lint
rluisr Aug 6, 2022
2db48f5
Lint
rluisr Aug 6, 2022
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
2 changes: 1 addition & 1 deletion .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ steps:
- name: deps
path: /go
commands:
- "curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2"
- "curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin "
- golangci-lint run
when:
event:
Expand Down
8 changes: 4 additions & 4 deletions gauges.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ var (
Name: "metadata_config",
Help: "metadata config",
}, []string{"name", "cluster_name", "time_refresh_in_ms", "group_replication_id"})
metadataConfigNodeGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{
metadataConfigNodesGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{
Namespace: nameSpace,
Name: "metadata_config_node",
Help: "metadata config node",
}, []string{"name", "router_host", "cluster_name", "hostname", "port"})
Name: "metadata_config_nodes",
Help: "count of metadata config node",
}, []string{"name", "router_host", "cluster_name"})
metadataStatusGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{
Namespace: nameSpace,
Name: "metadata_status",
Expand Down
9 changes: 3 additions & 6 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"crypto/tls"
"crypto/x509"
"fmt"
"io/ioutil"
"log"
"net/http"
"os"
Expand Down Expand Up @@ -97,7 +96,7 @@ func initializeClientOptions() (*mysqlrouter.Options, error) {
return nil, err
}

caCert, err := ioutil.ReadFile(caPath)
caCert, err := os.ReadFile(caPath)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -155,10 +154,8 @@ func collectMetrics() {
}
metadataConfigGauge.WithLabelValues(metadata.Name, metadataConfig.ClusterName, strconv.Itoa(metadataConfig.TimeRefreshInMs), metadataConfig.GroupReplicationID)

// config node
for _, metadataConfigNode := range metadataConfig.Nodes {
metadataConfigNodeGauge.WithLabelValues(metadata.Name, router.Hostname, metadataConfig.ClusterName, metadataConfigNode.Hostname, strconv.Itoa(metadataConfigNode.Port))
}
// config nodes count
metadataConfigNodesGauge.WithLabelValues(metadata.Name, router.Hostname, metadataConfig.ClusterName, strconv.Itoa(len(metadataConfig.Nodes)))

// status
if args.CollectMetadataStatus {
Expand Down