Skip to content

Commit 0c3d162

Browse files
committed
prometheus changes commented out
1 parent c490ea5 commit 0c3d162

File tree

2 files changed

+23
-27
lines changed

2 files changed

+23
-27
lines changed

api/v1/coherence_types.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,7 +1517,7 @@ type ServiceMonitorSpec struct {
15171517
// TLS configuration to use when scraping the endpoint
15181518
// See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint
15191519
// +optional
1520-
TLSConfig *monitoringv1.TLSConfig `json:"tlsConfig,omitempty"`
1520+
//TLSConfig *monitoringv1.TLSConfig `json:"tlsConfig,omitempty"`
15211521
// File to read bearer token for scraping targets.
15221522
// Deprecated: use `authorization` instead.
15231523
// +optional
@@ -1527,7 +1527,7 @@ type ServiceMonitorSpec struct {
15271527
// the Prometheus Operator.
15281528
// Deprecated: use `authorization` instead.
15291529
// +optional
1530-
BearerTokenSecret *corev1.SecretKeySelector `json:"bearerTokenSecret,omitempty"`
1530+
//BearerTokenSecret *corev1.SecretKeySelector `json:"bearerTokenSecret,omitempty"`
15311531
// `authorization` configures the Authorization header credentials to use when
15321532
// scraping the target.
15331533
// See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint
@@ -1548,7 +1548,7 @@ type ServiceMonitorSpec struct {
15481548
// More info: https://prometheus.io/docs/operating/configuration/#endpoints
15491549
// See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint
15501550
// +optional
1551-
BasicAuth *monitoringv1.BasicAuth `json:"basicAuth,omitempty"`
1551+
//BasicAuth *monitoringv1.BasicAuth `json:"basicAuth,omitempty"`
15521552
// MetricRelabelings to apply to samples before ingestion.
15531553
// See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint
15541554
// +listType=atomic
@@ -1563,7 +1563,7 @@ type ServiceMonitorSpec struct {
15631563
// ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.
15641564
// See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint
15651565
// +optional
1566-
ProxyURL *string `json:"proxyURL,omitempty"`
1566+
//ProxyURL *string `json:"proxyURL,omitempty"`
15671567
}
15681568

15691569
func (in *ServiceMonitorSpec) CreateServiceMonitor() monitoringv1.ServiceMonitorSpec {
@@ -1585,23 +1585,23 @@ func (in *ServiceMonitorSpec) CreateEndpoint() monitoringv1.Endpoint {
15851585
}
15861586

15871587
return monitoringv1.Endpoint{
1588-
Path: in.Path,
1589-
Scheme: in.Scheme,
1590-
Params: in.Params,
1591-
Interval: in.Interval,
1592-
ScrapeTimeout: in.ScrapeTimeout,
1593-
TLSConfig: in.TLSConfig,
1594-
BearerTokenFile: in.BearerTokenFile,
1595-
BearerTokenSecret: in.BearerTokenSecret,
1596-
HonorLabels: in.HonorLabels,
1597-
HonorTimestamps: in.HonorTimestamps,
1598-
BasicAuth: in.BasicAuth,
1588+
Path: in.Path,
1589+
Scheme: in.Scheme,
1590+
Params: in.Params,
1591+
Interval: in.Interval,
1592+
ScrapeTimeout: in.ScrapeTimeout,
1593+
//TLSConfig: in.TLSConfig,
1594+
BearerTokenFile: in.BearerTokenFile,
1595+
//BearerTokenSecret: in.BearerTokenSecret,
1596+
HonorLabels: in.HonorLabels,
1597+
HonorTimestamps: in.HonorTimestamps,
1598+
//BasicAuth: in.BasicAuth,
15991599
MetricRelabelConfigs: in.MetricRelabelings,
16001600
RelabelConfigs: in.Relabelings,
1601-
ProxyConfig: monitoringv1.ProxyConfig{
1602-
ProxyURL: in.ProxyURL,
1603-
},
1604-
}
1601+
/* ProxyConfig: monitoringv1.ProxyConfig{
1602+
ProxyURL: in.ProxyURL,
1603+
},
1604+
*/}
16051605
}
16061606

16071607
// ----- JvmDebugSpec struct ---------------------------------------------------

docs/about/04_coherence_spec.adoc

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
///////////////////////////////////////////////////////////////////////////////
22

3-
Copyright (c) 2020, 2025, Oracle and/or its affiliates.
3+
Copyright (c) 2020, 2026, Oracle and/or its affiliates.
44
Licensed under the Universal Permissive License v 1.0 as shown at
55
http://oss.oracle.com/licenses/upl.
66

@@ -1004,18 +1004,14 @@ m| scheme | HTTP scheme to use for scraping. See https://github.com/prometheus-o
10041004
m| params | Optional HTTP URL parameters See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint m| map[string][]string | false
10051005
m| interval | Interval at which metrics should be scraped See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint m| monitoringv1.Duration | false
10061006
m| scrapeTimeout | Timeout after which the scrape is ended See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint m| monitoringv1.Duration | false
1007-
m| tlsConfig | TLS configuration to use when scraping the endpoint See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint m| *monitoringv1.TLSConfig | false
1008-
m| bearerTokenFile | File to read bearer token for scraping targets. Deprecated: use `authorization` instead. m| string | false
1009-
m| bearerTokenSecret | Secret to mount to read bearer token for scraping targets. The secret needs to be in the same namespace as the service monitor and accessible by the Prometheus Operator. Deprecated: use `authorization` instead. m| *https://{k8s-doc-link}/#secretkeyselector-v1-core[corev1.SecretKeySelector] | false
1010-
m| authorization | `authorization` configures the Authorization header credentials to use when scraping the target. See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint +
1007+
m| bearerTokenFile | TLS configuration to use when scraping the endpoint See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint TLSConfig *monitoringv1.TLSConfig `json:"tlsConfig,omitempty"` File to read bearer token for scraping targets. Deprecated: use `authorization` instead. m| string | false
1008+
m| authorization | Secret to mount to read bearer token for scraping targets. The secret needs to be in the same namespace as the service monitor and accessible by the Prometheus Operator. Deprecated: use `authorization` instead. BearerTokenSecret *corev1.SecretKeySelector `json:"bearerTokenSecret,omitempty"` `authorization` configures the Authorization header credentials to use when scraping the target. See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint +
10111009
+
10121010
Cannot be set at the same time as `basicAuth`, or `oauth2`. m| *monitoringv1.SafeAuthorization | false
10131011
m| honorLabels | HonorLabels chooses the metric labels on collisions with target labels. See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint m| bool | false
10141012
m| honorTimestamps | HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint m| *bool | false
1015-
m| basicAuth | BasicAuth allow an endpoint to authenticate over basic authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint m| *monitoringv1.BasicAuth | false
1016-
m| metricRelabelings | MetricRelabelings to apply to samples before ingestion. See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint m| []monitoringv1.RelabelConfig | false
1013+
m| metricRelabelings | BasicAuth allow an endpoint to authenticate over basic authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint BasicAuth *monitoringv1.BasicAuth `json:"basicAuth,omitempty"` MetricRelabelings to apply to samples before ingestion. See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint m| []monitoringv1.RelabelConfig | false
10171014
m| relabelings | Relabelings to apply to samples before scraping. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint m| []monitoringv1.RelabelConfig | false
1018-
m| proxyURL | ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint. See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#endpoint m| *string | false
10191015
|===
10201016
10211017
<<Table of Contents,Back to TOC>>

0 commit comments

Comments
 (0)