Skip to content

Commit c9834d9

Browse files
authored
bump vm to v1.128.0; run make docs (#1558)
1 parent 51b4560 commit c9834d9

File tree

4 files changed

+29
-8
lines changed

4 files changed

+29
-8
lines changed

docs/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ aliases:
1414
## tip
1515

1616
* Dependency: [vmoperator](https://docs.victoriametrics.com/operator/): Updated default versions for VL apps to [v1.36.1](https://github.com/VictoriaMetrics/VictoriaLogs/releases/tag/v1.36.1).
17-
* Dependency: [vmoperator](https://docs.victoriametrics.com/operator/): Updated default versions for VM apps to [v1.127.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.127.0) version
17+
* Dependency: [vmoperator](https://docs.victoriametrics.com/operator/): Updated default versions for VM apps to [v1.128.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.128.0) version
1818
* Dependency: [vmoperator](https://docs.victoriametrics.com/operator/): Updated default versions for VT apps to [v0.4.0](https://github.com/VictoriaMetrics/VictoriaTraces/releases/tag/v0.4.0) version
1919
* Dependency: [vmoperator](https://docs.victoriametrics.com/operator/): Updated default versions for VMAnomaly to [v1.26.1](https://docs.victoriametrics.com/anomaly-detection/changelog/#v1261) version
2020

docs/api.md

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@ Appears in: [VMAgentSecurityEnforcements](#vmagentsecurityenforcements), [VMAgen
12771277

12781278
AttachMetadata configures metadata attachment
12791279

1280-
Appears in: [Endpoint](#endpoint), [KubernetesSDConfig](#kubernetessdconfig), [PodMetricsEndpoint](#podmetricsendpoint), [VMPodScrapeSpec](#vmpodscrapespec), [VMServiceScrapeSpec](#vmservicescrapespec)
1280+
Appears in: [Endpoint](#endpoint), [KubernetesSDConfig](#kubernetessdconfig), [PodMetricsEndpoint](#podmetricsendpoint), [ScrapeClass](#scrapeclass), [VMPodScrapeSpec](#vmpodscrapespec), [VMServiceScrapeSpec](#vmservicescrapespec)
12811281

12821282
| Field | Description |
12831283
| --- | --- |
@@ -1290,7 +1290,7 @@ Appears in: [Endpoint](#endpoint), [KubernetesSDConfig](#kubernetessdconfig), [P
12901290

12911291
Authorization configures generic authorization params
12921292

1293-
Appears in: [APIServerConfig](#apiserverconfig), [ConsulSDConfig](#consulsdconfig), [DigitalOceanSDConfig](#digitaloceansdconfig), [Endpoint](#endpoint), [EndpointAuth](#endpointauth), [HTTPConfig](#httpconfig), [HTTPSDConfig](#httpsdconfig), [KubernetesSDConfig](#kubernetessdconfig), [PodMetricsEndpoint](#podmetricsendpoint), [TargetEndpoint](#targetendpoint), [VMNodeScrapeSpec](#vmnodescrapespec), [VMProbeSpec](#vmprobespec), [VMScrapeConfigSpec](#vmscrapeconfigspec)
1293+
Appears in: [APIServerConfig](#apiserverconfig), [ConsulSDConfig](#consulsdconfig), [DigitalOceanSDConfig](#digitaloceansdconfig), [Endpoint](#endpoint), [EndpointAuth](#endpointauth), [HTTPConfig](#httpconfig), [HTTPSDConfig](#httpsdconfig), [KubernetesSDConfig](#kubernetessdconfig), [PodMetricsEndpoint](#podmetricsendpoint), [ScrapeClass](#scrapeclass), [TargetEndpoint](#targetendpoint), [VMNodeScrapeSpec](#vmnodescrapespec), [VMProbeSpec](#vmprobespec), [VMScrapeConfigSpec](#vmscrapeconfigspec)
12941294

12951295
| Field | Description |
12961296
| --- | --- |
@@ -2502,7 +2502,7 @@ Appears in: [VMAlertmanagerConfigSpec](#vmalertmanagerconfigspec)
25022502
RelabelConfig allows dynamic rewriting of the label set
25032503
More info: https://docs.victoriametrics.com/victoriametrics/#relabeling
25042504

2505-
Appears in: [Endpoint](#endpoint), [EndpointRelabelings](#endpointrelabelings), [PodMetricsEndpoint](#podmetricsendpoint), [ProbeTargetIngress](#probetargetingress), [StreamAggrRule](#streamaggrrule), [TargetEndpoint](#targetendpoint), [VMAgentRemoteWriteSpec](#vmagentremotewritespec), [VMAgentSpec](#vmagentspec), [VMNodeScrapeSpec](#vmnodescrapespec), [VMProbeSpec](#vmprobespec), [VMProbeTargetStaticConfig](#vmprobetargetstaticconfig), [VMScrapeConfigSpec](#vmscrapeconfigspec)
2505+
Appears in: [Endpoint](#endpoint), [EndpointRelabelings](#endpointrelabelings), [PodMetricsEndpoint](#podmetricsendpoint), [ProbeTargetIngress](#probetargetingress), [ScrapeClass](#scrapeclass), [StreamAggrRule](#streamaggrrule), [TargetEndpoint](#targetendpoint), [VMAgentRemoteWriteSpec](#vmagentremotewritespec), [VMAgentSpec](#vmagentspec), [VMNodeScrapeSpec](#vmnodescrapespec), [VMProbeSpec](#vmprobespec), [VMProbeTargetStaticConfig](#vmprobetargetstaticconfig), [VMScrapeConfigSpec](#vmscrapeconfigspec)
25062506

25072507
| Field | Description |
25082508
| --- | --- |
@@ -2656,6 +2656,25 @@ Appears in: [VMRuleSpec](#vmrulespec)
26562656
| type<a href="#rulegroup-type" id="rulegroup-type">#</a><br/>_string_ | _(Optional)_<br/>Type defines datasource type for enterprise version of vmalert<br />possible values - prometheus,graphite,vlogs |
26572657

26582658

2659+
#### ScrapeClass
2660+
2661+
2662+
2663+
2664+
2665+
Appears in: [VMAgentSpec](#vmagentspec)
2666+
2667+
| Field | Description |
2668+
| --- | --- |
2669+
| attachMetadata<a href="#scrapeclass-attachmetadata" id="scrapeclass-attachmetadata">#</a><br/>_[AttachMetadata](#attachmetadata)_ | _(Optional)_<br/>AttachMetadata defines additional metadata to the discovered targets.<br />When the scrape object defines its own configuration, it takes<br />precedence over the scrape class configuration. |
2670+
| authorization<a href="#scrapeclass-authorization" id="scrapeclass-authorization">#</a><br/>_[Authorization](#authorization)_ | _(Optional)_<br/>authorization section for the ScrapeClass.<br />It will only apply if the scrape resource doesn't specify any Authorization. |
2671+
| default<a href="#scrapeclass-default" id="scrapeclass-default">#</a><br/>_boolean_ | _(Optional)_<br/>default defines that the scrape applies to all scrape objects that<br />don't configure an explicit scrape class name.<br /><br />Only one scrape class can be set as the default. |
2672+
| metricRelabelings<a href="#scrapeclass-metricrelabelings" id="scrapeclass-metricrelabelings">#</a><br/>_[RelabelConfig](#relabelconfig) array_ | _(Optional)_<br/>MetricRelabelings defines the relabeling rules to apply to all samples before ingestion. |
2673+
| name<a href="#scrapeclass-name" id="scrapeclass-name">#</a><br/>_string_ | _(Required)_<br/>name of the scrape class. |
2674+
| relabelings<a href="#scrapeclass-relabelings" id="scrapeclass-relabelings">#</a><br/>_[RelabelConfig](#relabelconfig) array_ | _(Optional)_<br/>Relabelings defines the relabeling rules to apply to all scrape targets. |
2675+
| tlsConfig<a href="#scrapeclass-tlsconfig" id="scrapeclass-tlsconfig">#</a><br/>_[TLSConfig](#tlsconfig)_ | _(Optional)_<br/>tlsConfig defines the TLS settings to use for the scrape. When the<br />scrape objects define their own CA, certificate and/or key, they take<br />precedence over the corresponding scrape class fields.<br /><br />For now only the `caFile`, `certFile` and `keyFile` fields are supported. |
2676+
2677+
26592678

26602679

26612680
#### SecretOrConfigMap
@@ -2981,7 +3000,7 @@ Appears in: [AlertmanagerGossipConfig](#alertmanagergossipconfig)
29813000

29823001
TLSConfig specifies TLSConfig configuration parameters.
29833002

2984-
Appears in: [APIServerConfig](#apiserverconfig), [ConsulSDConfig](#consulsdconfig), [DigitalOceanSDConfig](#digitaloceansdconfig), [EmailConfig](#emailconfig), [Endpoint](#endpoint), [EndpointAuth](#endpointauth), [HTTPAuth](#httpauth), [HTTPConfig](#httpconfig), [HTTPSDConfig](#httpsdconfig), [KubernetesSDConfig](#kubernetessdconfig), [OAuth2](#oauth2), [OpenStackSDConfig](#openstacksdconfig), [PodMetricsEndpoint](#podmetricsendpoint), [ProxyAuth](#proxyauth), [TargetEndpoint](#targetendpoint), [VMAgentRemoteWriteSpec](#vmagentremotewritespec), [VMAlertDatasourceSpec](#vmalertdatasourcespec), [VMAlertNotifierSpec](#vmalertnotifierspec), [VMAlertRemoteReadSpec](#vmalertremotereadspec), [VMAlertRemoteWriteSpec](#vmalertremotewritespec), [VMAnomalyHTTPClientSpec](#vmanomalyhttpclientspec), [VMAnomalyMonitoringPushSpec](#vmanomalymonitoringpushspec), [VMAnomalyReadersSpec](#vmanomalyreadersspec), [VMAnomalyWritersSpec](#vmanomalywritersspec), [VMAuthSpec](#vmauthspec), [VMAuthUnauthorizedUserAccessSpec](#vmauthunauthorizeduseraccessspec), [VMNodeScrapeSpec](#vmnodescrapespec), [VMProbeSpec](#vmprobespec), [VMScrapeConfigSpec](#vmscrapeconfigspec), [VMUserConfigOptions](#vmuserconfigoptions), [VMUserSpec](#vmuserspec)
3003+
Appears in: [APIServerConfig](#apiserverconfig), [ConsulSDConfig](#consulsdconfig), [DigitalOceanSDConfig](#digitaloceansdconfig), [EmailConfig](#emailconfig), [Endpoint](#endpoint), [EndpointAuth](#endpointauth), [HTTPAuth](#httpauth), [HTTPConfig](#httpconfig), [HTTPSDConfig](#httpsdconfig), [KubernetesSDConfig](#kubernetessdconfig), [OAuth2](#oauth2), [OpenStackSDConfig](#openstacksdconfig), [PodMetricsEndpoint](#podmetricsendpoint), [ProxyAuth](#proxyauth), [ScrapeClass](#scrapeclass), [TargetEndpoint](#targetendpoint), [VMAgentRemoteWriteSpec](#vmagentremotewritespec), [VMAlertDatasourceSpec](#vmalertdatasourcespec), [VMAlertNotifierSpec](#vmalertnotifierspec), [VMAlertRemoteReadSpec](#vmalertremotereadspec), [VMAlertRemoteWriteSpec](#vmalertremotewritespec), [VMAnomalyHTTPClientSpec](#vmanomalyhttpclientspec), [VMAnomalyMonitoringPushSpec](#vmanomalymonitoringpushspec), [VMAnomalyReadersSpec](#vmanomalyreadersspec), [VMAnomalyWritersSpec](#vmanomalywritersspec), [VMAuthSpec](#vmauthspec), [VMAuthUnauthorizedUserAccessSpec](#vmauthunauthorizeduseraccessspec), [VMNodeScrapeSpec](#vmnodescrapespec), [VMProbeSpec](#vmprobespec), [VMScrapeConfigSpec](#vmscrapeconfigspec), [VMUserConfigOptions](#vmuserconfigoptions), [VMUserSpec](#vmuserspec)
29853004

29863005
| Field | Description |
29873006
| --- | --- |
@@ -3452,6 +3471,7 @@ Appears in: [VMAgent](#vmagent)
34523471
| rollingUpdate<a href="#vmagentspec-rollingupdate" id="vmagentspec-rollingupdate">#</a><br/>_[RollingUpdateDeployment](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#rollingupdatedeployment-v1-apps)_ | _(Optional)_<br/>RollingUpdate - overrides deployment update params. |
34533472
| runtimeClassName<a href="#vmagentspec-runtimeclassname" id="vmagentspec-runtimeclassname">#</a><br/>_string_ | _(Optional)_<br/>RuntimeClassName - defines runtime class for kubernetes pod.<br />https://kubernetes.io/docs/concepts/containers/runtime-class/ |
34543473
| schedulerName<a href="#vmagentspec-schedulername" id="vmagentspec-schedulername">#</a><br/>_string_ | _(Optional)_<br/>SchedulerName - defines kubernetes scheduler name |
3474+
| scrapeClasses<a href="#vmagentspec-scrapeclasses" id="vmagentspec-scrapeclasses">#</a><br/>_[ScrapeClass](#scrapeclass) array_ | _(Optional)_<br/>ScrapeClasses defines the list of scrape classes to expose to scraping objects such as<br />PodScrapes, ServiceScrapes, Probes and ScrapeConfigs. |
34553475
| scrapeConfigNamespaceSelector<a href="#vmagentspec-scrapeconfignamespaceselector" id="vmagentspec-scrapeconfignamespaceselector">#</a><br/>_[LabelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#labelselector-v1-meta)_ | _(Optional)_<br/>ScrapeConfigNamespaceSelector defines Namespaces to be selected for VMScrapeConfig discovery.<br />Works in combination with Selector.<br />NamespaceSelector nil - only objects at VMAgent namespace.<br />Selector nil - only objects at NamespaceSelector namespaces.<br />If both nil - behaviour controlled by selectAllByDefault |
34563476
| scrapeConfigRelabelTemplate<a href="#vmagentspec-scrapeconfigrelabeltemplate" id="vmagentspec-scrapeconfigrelabeltemplate">#</a><br/>_[RelabelConfig](#relabelconfig) array_ | _(Optional)_<br/>ScrapeConfigRelabelTemplate defines relabel config, that will be added to each VMScrapeConfig.<br />it's useful for adding specific labels to all targets |
34573477
| scrapeConfigSelector<a href="#vmagentspec-scrapeconfigselector" id="vmagentspec-scrapeconfigselector">#</a><br/>_[LabelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#labelselector-v1-meta)_ | _(Optional)_<br/>ScrapeConfigSelector defines VMScrapeConfig to be selected for target discovery.<br />Works in combination with NamespaceSelector. |
@@ -4568,6 +4588,7 @@ Appears in: [VLAgentSpec](#vlagentspec), [VLInsert](#vlinsert), [VLSelect](#vlse
45684588
| namespaceSelector<a href="#vmservicescrapespec-namespaceselector" id="vmservicescrapespec-namespaceselector">#</a><br/>_[NamespaceSelector](#namespaceselector)_ | _(Optional)_<br/>Selector to select which namespaces the Endpoints objects are discovered from. |
45694589
| podTargetLabels<a href="#vmservicescrapespec-podtargetlabels" id="vmservicescrapespec-podtargetlabels">#</a><br/>_string array_ | _(Optional)_<br/>PodTargetLabels transfers labels on the Kubernetes Pod onto the target. |
45704590
| sampleLimit<a href="#vmservicescrapespec-samplelimit" id="vmservicescrapespec-samplelimit">#</a><br/>_integer_ | _(Optional)_<br/>SampleLimit defines per-scrape limit on number of scraped samples that will be accepted. |
4591+
| scrapeClass<a href="#vmservicescrapespec-scrapeclass" id="vmservicescrapespec-scrapeclass">#</a><br/>_string_ | _(Optional)_<br/>ScrapeClass defined scrape class to apply |
45714592
| selector<a href="#vmservicescrapespec-selector" id="vmservicescrapespec-selector">#</a><br/>_[LabelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#labelselector-v1-meta)_ | _(Optional)_<br/>Selector to select Endpoints objects by corresponding Service labels. |
45724593
| seriesLimit<a href="#vmservicescrapespec-serieslimit" id="vmservicescrapespec-serieslimit">#</a><br/>_integer_ | _(Optional)_<br/>SeriesLimit defines per-scrape limit on number of unique time series<br />a single target can expose during all the scrapes on the time window of 24h. |
45734594
| targetLabels<a href="#vmservicescrapespec-targetlabels" id="vmservicescrapespec-targetlabels">#</a><br/>_string array_ | _(Optional)_<br/>TargetLabels transfers labels on the Kubernetes Service onto the target. |

docs/env.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Environment variables |
22
| --- |
3-
| VM_METRICS_VERSION: `v1.127.0` <a href="#variables-vm-metrics-version" id="variables-vm-metrics-version">#</a> |
3+
| VM_METRICS_VERSION: `v1.128.0` <a href="#variables-vm-metrics-version" id="variables-vm-metrics-version">#</a> |
44
| VM_LOGS_VERSION: `v1.36.1` <a href="#variables-vm-logs-version" id="variables-vm-logs-version">#</a> |
55
| VM_ANOMALY_VERSION: `v1.25.2` <a href="#variables-vm-anomaly-version" id="variables-vm-anomaly-version">#</a> |
66
| VM_USECUSTOMCONFIGRELOADER: `false` <a href="#variables-vm-usecustomconfigreloader" id="variables-vm-usecustomconfigreloader">#</a><br>enables custom config reloader for vmauth and vmagent, it should speed-up config reloading process. |

internal/config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var (
3434
//
3535
// DO NOT FORGET TO MODIFY VERSIONS IN BaseOperatorConf
3636
defaultEnvs = map[string]string{
37-
"VM_METRICS_VERSION": "v1.127.0",
37+
"VM_METRICS_VERSION": "v1.128.0",
3838
"VM_LOGS_VERSION": "v1.36.1",
3939
"VM_ANOMALY_VERSION": "v1.26.1",
4040
"VM_TRACES_VERSION": "v0.4.0",
@@ -103,7 +103,7 @@ type BaseOperatorConf struct {
103103
//
104104
// DO NOT FORGET TO MODIFY VERSIONS IN defaultEnvs
105105

106-
MetricsVersion string `default:"v1.127.0" env:"METRICS_VERSION"`
106+
MetricsVersion string `default:"v1.128.0" env:"METRICS_VERSION"`
107107
LogsVersion string `default:"v1.36.1" env:"LOGS_VERSION"`
108108
AnomalyVersion string `default:"v1.25.2" env:"ANOMALY_VERSION"`
109109

0 commit comments

Comments
 (0)