Skip to content

Commit 8b62aec

Browse files
authored
Added support for prometheus addnotations #293 (#256)
1 parent 83fe33b commit 8b62aec

File tree

4 files changed

+26
-3
lines changed

4 files changed

+26
-3
lines changed

models/create_tenant_request.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

restapi/admin_tenants.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -681,10 +681,12 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
681681
}
682682
// add annotations
683683
var annotations map[string]string
684-
if len(tenantReq.Annotations) > 0 {
685-
if minInst.Spec.Metadata == nil {
686-
minInst.Spec.Metadata = &metav1.ObjectMeta{}
684+
if minInst.Spec.Metadata == nil {
685+
minInst.Spec.Metadata = &metav1.ObjectMeta{
686+
Annotations: map[string]string{},
687687
}
688+
}
689+
if len(tenantReq.Annotations) > 0 {
688690
annotations = tenantReq.Annotations
689691
minInst.Spec.Metadata.Annotations = annotations
690692
}
@@ -718,6 +720,13 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
718720
}
719721
}
720722

723+
// prometheus annotations support
724+
if tenantReq.EnablePrometheus != nil && *tenantReq.EnablePrometheus && minInst.Spec.Metadata != nil && minInst.Spec.Metadata.Annotations != nil {
725+
minInst.Spec.Metadata.Annotations["prometheus.io/path"] = "/minio/prometheus/metrics"
726+
minInst.Spec.Metadata.Annotations["prometheus.io/port"] = fmt.Sprint(operator.MinIOPort)
727+
minInst.Spec.Metadata.Annotations["prometheus.io/scrape"] = "true"
728+
}
729+
721730
// set console image if provided
722731
if tenantReq.ConsoleImage != "" {
723732
minInst.Spec.Console.Image = tenantReq.ConsoleImage

restapi/embedded_spec.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swagger.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1837,6 +1837,9 @@ definitions:
18371837
enable_tls:
18381838
type: boolean
18391839
default: true
1840+
enable_prometheus:
1841+
type: boolean
1842+
default: false
18401843
namespace:
18411844
type: string
18421845
erasureCodingParity:

0 commit comments

Comments
 (0)