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.

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

[feat]support report the index of servicecomb_kie_config_count #316

Merged
merged 1 commit into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions examples/dev/conf/chassis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ servicecomb:
protocols:
rest:
listenAddress: 127.0.0.1:30110
metrics:
enable: true
little-cui marked this conversation as resolved.
Show resolved Hide resolved
interval: 10s
match:
rateLimitPolicy: |
matches:
Expand Down
3 changes: 3 additions & 0 deletions examples/dev/kie-conf.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
db:
# kind can be mongo, etcd, embedded_etcd
kind: embedded_etcd

# localFilePath: is the root path to store local kv files
# uri: http://127.0.0.1:2379
# uri is the db endpoints list
# kind=mongo, then is the mongodb cluster's uri, e.g. mongodb://127.0.0.1:27017/kie
# kind=etcd, then is the remote etcd server's advertise-client-urls, e.g. http://127.0.0.1:2379
Expand Down
1 change: 0 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630=
github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
Expand Down
2 changes: 1 addition & 1 deletion server/config/struct.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type Config struct {
DB DB `yaml:"db"`
RBAC RBAC `yaml:"rbac"`
Sync Sync `yaml:"sync"`
//config from cli
// config from cli
ConfigFile string
NodeName string
ListenPeerAddr string
Expand Down
54 changes: 54 additions & 0 deletions server/metrics/prometheus.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package metrics

import (
"context"
"time"

"github.com/go-chassis/go-archaius"
"github.com/go-chassis/go-chassis/v2/pkg/metrics"
"github.com/go-chassis/openlog"

"github.com/apache/servicecomb-kie/server/datasource"
)

const domain = "default"
const project = "default"

func InitMetric() error {
err := metrics.CreateGauge(metrics.GaugeOpts{
Key: "servicecomb_kie_config_count",
Help: "use to show the number of config under a specifical domain and project pair",
Labels: []string{"domain", "project"},
})
if err != nil {
openlog.Error("init servicecomb_kie_config_count Gauge fail:" + err.Error())
return err
}
reportIntervalstr := archaius.GetString("servicecomb.metrics.interval", "5s")
reportInterval, _ := time.ParseDuration(reportIntervalstr)
reportTicker := time.NewTicker(reportInterval)
go func() {
for {
_, ok := <-reportTicker.C
if !ok {
return
}
getTotalConfigCount(project, domain)
}
}()
return nil
}

func getTotalConfigCount(project, domain string) {
total, err := datasource.GetBroker().GetKVDao().Total(context.TODO(), project, domain)
if err != nil {
openlog.Error("set total config number fail: " + err.Error())
return
}
labels := map[string]string{"domain": domain, "project": project}
err = metrics.GaugeSet("servicecomb_kie_config_count", float64(total), labels)
if err != nil {
openlog.Error("set total config number fail:" + err.Error())
return
}
}
4 changes: 4 additions & 0 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/apache/servicecomb-kie/server/config"
"github.com/apache/servicecomb-kie/server/datasource"
"github.com/apache/servicecomb-kie/server/db"
"github.com/apache/servicecomb-kie/server/metrics"
"github.com/apache/servicecomb-kie/server/pubsub"
"github.com/apache/servicecomb-kie/server/rbac"
v1 "github.com/apache/servicecomb-kie/server/resource/v1"
Expand All @@ -47,6 +48,9 @@ func Run() {
if err := datasource.Init(config.GetDB().Kind); err != nil {
openlog.Fatal(err.Error())
}
if err := metrics.InitMetric(); err != nil {
openlog.Fatal(err.Error())
}
if err := validator.Init(); err != nil {
openlog.Fatal("validate init failed: " + err.Error())
}
Expand Down
Loading