Skip to content

Commit 4f8631c

Browse files
authored
Merge pull request #51 from rluisr/add-service-name
feat(main): add service name for MySQL Router
2 parents 085f1b8 + e8cf28e commit 4f8631c

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
with:
3535
images: ghcr.io/rluisr/mysqlrouter_exporter
3636
- name: Set up QEMU
37-
uses: docker/setup-qemu-action@v2
37+
uses: docker/setup-qemu-action@v3
3838
- name: Set up Docker Buildx
3939
uses: docker/setup-buildx-action@v3
4040
- name: Login to GitHub Container Registry

.pre-commit-config.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ Application Options:
6262
--user= Username for REST API [$MYSQLROUTER_EXPORTER_USER]
6363
--pass= Password for REST API [$MYSQLROUTER_EXPORTER_PASS]
6464
-p, --listen-port= Listen port (default: 49152)
65+
--service-name= Service name for MySQL Router [$MYSQLROUTER_EXPORTER_SERVICE_NAME]
6566
--tls-ca-cert-path= TLS CA cacert path [$MYSQLROUTER_TLS_CACERT_PATH]
6667
--tls-cert-path= TLS cert path [$MYSQLROUTER_TLS_CERT_PATH]
6768
--tls-key-path= TLS key path [$MYSQLROUTER_TLS_KEY_PATH]

gauges.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ var (
1515
Namespace: nameSpace,
1616
Name: "router_status",
1717
Help: "MySQL Router information",
18-
}, []string{"process_id", "product_edition", "time_started", "version", "hostname"})
18+
}, []string{"process_id", "product_edition", "time_started", "version", "hostname", "service"})
19+
1920
metadataGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{
2021
Namespace: nameSpace,
2122
Name: "metadata",

main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ var args struct {
3030
RestAPIUser string `short:"" long:"user" required:"false" env:"MYSQLROUTER_EXPORTER_USER" description:"Username for REST API"`
3131
RestAPIPass string `short:"" long:"pass" required:"false" env:"MYSQLROUTER_EXPORTER_PASS" description:"Password for REST API"`
3232
ListenPort int `short:"p" long:"listen-port" default:"49152" description:"Listen port"`
33+
ServiceName string `short:"" long:"service-name" required:"true" env:"MYSQLROUTER_EXPORTER_SERVICE_NAME" description:"Service name for MySQL Router"`
3334
TLSCACertPath string `short:"" long:"tls-ca-cert-path" required:"false" env:"MYSQLROUTER_TLS_CACERT_PATH" description:"TLS CA cacert path"`
3435
TLSCertPath string `short:"" long:"tls-cert-path" required:"false" env:"MYSQLROUTER_TLS_CERT_PATH" description:"TLS cert path"`
3536
TLSKeyPath string `short:"" long:"tls-key-path" required:"false" env:"MYSQLROUTER_TLS_KEY_PATH" description:"TLS key path"`
@@ -151,7 +152,7 @@ func collectRouterMetrics() (*mysqlrouter.Router, error) {
151152
}
152153

153154
routerUpGauge.Set(1)
154-
routerStatusGauge.WithLabelValues(strconv.Itoa(router.ProcessID), router.ProductEdition, router.TimeStarted.String(), router.Version, router.Hostname)
155+
routerStatusGauge.WithLabelValues(strconv.Itoa(router.ProcessID), router.ProductEdition, router.TimeStarted.String(), router.Version, router.Hostname, args.ServiceName)
155156

156157
lastRouter = router
157158

0 commit comments

Comments
 (0)