Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14078 from ninjadq/fix_self_registration_metric 

Fix metric label related things
This commit is contained in:
Qian Deng 2021-01-28 17:27:53 +08:00 committed by GitHub
parent 6f3774ac8b 66fd4a9728
commit ebe05919be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pkg/exporter/project_collector.go
View File

@ -41,28 +41,28 @@ var (
valueType: prometheus.GaugeValue,
}
projectUsage = typedDesc{
desc: newDescWithLables("", "project_usage_byte", "The used resource of a project", "project_id"),
desc: newDescWithLables("", "project_usage_byte", "The used resource of a project", "project_name"),
valueType: prometheus.GaugeValue,
}
projectQuote = typedDesc{
desc: newDescWithLables("", "project_quota_byte", "The quota of a project", "project_id"),
desc: newDescWithLables("", "project_quota_byte", "The quota of a project", "project_name"),
valueType: prometheus.GaugeValue,
}
projectRepoTotal = typedDesc{
desc: newDescWithLables("", "project_repo_total", "Total project repos number", "project_id", "public"),
desc: newDescWithLables("", "project_repo_total", "Total project repos number", "project_name", "public"),
valueType: prometheus.GaugeValue,
}
projectMemberTotal = typedDesc{
desc: newDescWithLables("", "project_member_total", "Total members number of a project", "project_id"),
desc: newDescWithLables("", "project_member_total", "Total members number of a project", "project_name"),
valueType: prometheus.GaugeValue,
}
artifactPullTotal = typedDesc{
desc: newDescWithLables("", "image_pulled", "The pull number of an image", "project_id"),
desc: newDescWithLables("", "artifact_pulled", "The pull number of an artifact", "project_name"),
valueType: prometheus.GaugeValue,
}
projectArtifactTotal = typedDesc{
desc: newDescWithLables("", "project_artifact_total", "Total project images number", "project_id", "public", "image_type"),
desc: newDescWithLables("", "project_artifact_total", "Total project artifacts number", "project_name", "public", "artifact_type"),
valueType: prometheus.GaugeValue,
}
)

5
src/pkg/exporter/system_collector.go
View File

@ -2,6 +2,7 @@ package exporter
import (
"encoding/json"
"strconv"
"github.com/goharbor/harbor/src/lib/log"
"github.com/prometheus/client_golang/prometheus"
@ -66,7 +67,7 @@ func (hc *SystemInfoCollector) getSysInfo() []prometheus.Metric {
result = append(result, harborSysInfo.MustNewConstMetric(1,
sysInfoResponse.AuthMode,
sysInfoResponse.HarborVersion,
sysInfoResponse.SelfRegistration))
strconv.FormatBool(sysInfoResponse.SelfRegistration)))
if CacheEnabled() {
CachePut(systemInfoCollectorName, result)
}
@ -76,5 +77,5 @@ func (hc *SystemInfoCollector) getSysInfo() []prometheus.Metric {
type responseSysInfo struct {
AuthMode string `json:"auth_mode"`
HarborVersion string `json:"harbor_version"`
SelfRegistration string `json:"self_registration"`
SelfRegistration bool `json:"self_registration"`
}

2
tests/apitests/python/test_verify_metrics_enabled.py
View File

@ -13,7 +13,7 @@ class TestMetricsExist(unittest.TestCase):
'core': golang_basic_metrics + ["harbor_core_http_request_total", "harbor_core_http_request_duration_seconds",
"harbor_core_http_inflight_requests"],
'registry': golang_basic_metrics + ["registry_http_in_flight_requests"],
'exporter': golang_basic_metrics + ["harbor_image_pulled",
'exporter': golang_basic_metrics + ["artifact_pulled",
"harbor_project_artifact_total", "harbor_project_member_total", "harbor_project_quota_byte",
"harbor_project_repo_total", "harbor_project_total"
]