Skip to content

Commit

Permalink
Change metric relabelings default to array (#73)
Browse files Browse the repository at this point in the history 
* Change relabelings default to array

* Update README and values.schema.json for modified charts

* Trigger CI

* Update Chart.yaml

* Trigger CI

---------

Co-authored-by: a-thomas-22 <[email protected]>
  • Loading branch information
@a-thomas-22
a-thomas-22 and a-thomas-22 authored Aug 16, 2024
1 parent 51d7865 commit f85b412
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 28 deletions.
2 changes: 1 addition & 1 deletion charts/das/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ maintainers:

type: application

version: 0.5.5
version: 0.5.6

appVersion: "v3.1.0-7d1d84c"
2 changes: 1 addition & 1 deletion charts/das/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ extraEnv:
| `serviceMonitor.portName` | Name of the port to monitor | `metrics` |
| `serviceMonitor.path` | Path to monitor | `/debug/metrics/prometheus` |
| `serviceMonitor.interval` | Interval to monitor | `5s` |
| `serviceMonitor.relabelings` | Add relabelings for the metrics being scraped | `{}` |
| `serviceMonitor.relabelings` | Add relabelings for the metrics being scraped | `[]` |
| `perReplicaService.enabled` | Enable per replica service | `false` |
| `headlessservice.enabled` | Enable headless service | `false` |
| `headlessservice.publishNotReadyAddresses` | Publish not ready addresses | `true` |
Expand Down
2 changes: 1 addition & 1 deletion charts/das/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ serviceMonitor:
portName: metrics
path: /debug/metrics/prometheus
interval: 5s
relabelings: {}
relabelings: []

## @param perReplicaService.enabled Enable per replica service
perReplicaService:
Expand Down
2 changes: 1 addition & 1 deletion charts/nitro/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ maintainers:

type: application

version: 0.6.9
version: 0.6.10

appVersion: "v3.1.0-7d1d84c"
4 changes: 2 additions & 2 deletions charts/nitro/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ helm install xai offchainlabs/nitro -f values.yaml
| `serviceMonitor.portName` | Name of the port to monitor | `metrics` |
| `serviceMonitor.path` | Path to monitor | `/debug/metrics/prometheus` |
| `serviceMonitor.interval` | Interval to monitor | `5s` |
| `serviceMonitor.relabelings` | Add relabelings for the metrics being scraped | `{}` |
| `serviceMonitor.relabelings` | Add relabelings for the metrics being scraped | `[]` |
| `perReplicaService.enabled` | Enable a service for each sts replica | `false` |
| `perReplicaService.publishNotReadyAddresses` | Publish not ready addresses | `true` |
| `headlessservice.enabled` | Enable headless service | `true` |
Expand Down Expand Up @@ -190,7 +190,7 @@ helm install xai offchainlabs/nitro -f values.yaml
| `validator.splitvalidator.global.serviceMonitor.portName` | Name of the port to monitor | `metrics` |
| `validator.splitvalidator.global.serviceMonitor.path` | Path to monitor | `/debug/metrics/prometheus` |
| `validator.splitvalidator.global.serviceMonitor.interval` | Interval to monitor | `5s` |
| `validator.splitvalidator.global.serviceMonitor.relabelings` | Add relabelings for the metrics being scraped | `{}` |
| `validator.splitvalidator.global.serviceMonitor.relabelings` | Add relabelings for the metrics being scraped | `[]` |
| `validator.splitvalidator.global.livenessProbe.enabled` | Enable the liveness probe for the validator statefulset | `true` |
| `validator.splitvalidator.global.livenessProbe.tcpSocket.port` | Port to probe | `auth` |
| `validator.splitvalidator.global.livenessProbe.initialDelaySeconds` | Initial delay for the liveness probe | `30` |
Expand Down
4 changes: 2 additions & 2 deletions charts/nitro/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ serviceMonitor:
portName: metrics
path: /debug/metrics/prometheus
interval: 5s
relabelings: {}
relabelings: []

## @param perReplicaService.enabled Enable a service for each sts replica
## @param perReplicaService.publishNotReadyAddresses Publish not ready addresses
Expand Down Expand Up @@ -322,7 +322,7 @@ validator:
## @param validator.splitvalidator.global.serviceMonitor.interval Interval to monitor
interval: 5s
## @param validator.splitvalidator.global.serviceMonitor.relabelings Add relabelings for the metrics being scraped
relabelings: {}
relabelings: []

livenessProbe:
## @param validator.splitvalidator.global.livenessProbe.enabled Enable the liveness probe for the validator statefulset
Expand Down
2 changes: 1 addition & 1 deletion charts/relay/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ maintainers:

type: application

version: 0.5.4
version: 0.5.5

appVersion: "v3.1.0-7d1d84c"
35 changes: 17 additions & 18 deletions charts/relay/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ helm install <my-release> offchainlabs/relay \
| `serviceMonitor.portName` | Port name for prometheus service monitor | `metrics` |
| `serviceMonitor.path` | Path for prometheus service monitor | `/debug/metrics/prometheus` |
| `serviceMonitor.interval` | Interval for prometheus service monitor | `5s` |
| `serviceMonitor.relabelings` | Add relabelings for the metrics being scraped | `{}` |
| `serviceMonitor.relabelings` | Add relabelings for the metrics being scraped | `[]` |
| `perReplicaService.enabled` | Enable per replica service | `false` |
| `perReplicaService.publishNotReadyAddresses` | Publish not ready addresses | `false` |
| `headlessservice.enabled` | Enable headless service | `true` |
Expand Down Expand Up @@ -97,23 +97,22 @@ helm install <my-release> offchainlabs/relay \

### Relay Configmap

| Name | Description | Value |
| ---------------------------------------------------------- | ------------------------------------------------------ | ------------------------------------------------------------------- |
| `configmap.enabled` | Enable configmap | `true` |
| `configmap.data` | See Configuration Options for the full list of options | |
| `configmap.data.chain.id` | Chain id | `42161` |
| `configmap.data.conf.env-prefix` | Environment variable prefix | `NITRO` |
| `configmap.data.log-type` | Log type | `json` |
| `configmap.data.metrics` | Enable metrics | `false` |
| `configmap.data.metrics-server.addr` | Metrics server address | `0.0.0.0` |
| `configmap.data.metrics-server.port` | Metrics server port | `6070` |
| `configmap.data.node.feed.input.url` | Feed input url | `""` |
| `configmap.data.node.feed.input.reconnect-initial-backoff` | Feed input reconnect initial backoff | `50ms` |
| `configmap.data.node.feed.input.reconnect-maximum-backoff` | Feed input reconnect maximum backoff | `800ms` |
| `configmap.data.node.feed.input.timeout` | Feed input timeout | `10s` |
| `configmap.data.node.feed.output.addr` | Feed output address | `0.0.0.0` |
| `configmap.data.node.feed.output.port` | Feed output port | `9642` |
| `configmap.data.validation.wasm.allowed-wasm-module-roots` | Default flags as of v3.0.0 | `["/home/user/nitro-legacy/machines","/home/user/target/machines"]` |
| Name | Description | Value |
| ---------------------------------------------------------- | ------------------------------------------------------ | --------- |
| `configmap.enabled` | Enable configmap | `true` |
| `configmap.data` | See Configuration Options for the full list of options | |
| `configmap.data.chain.id` | Chain id | `42161` |
| `configmap.data.conf.env-prefix` | Environment variable prefix | `NITRO` |
| `configmap.data.log-type` | Log type | `json` |
| `configmap.data.metrics` | Enable metrics | `false` |
| `configmap.data.metrics-server.addr` | Metrics server address | `0.0.0.0` |
| `configmap.data.metrics-server.port` | Metrics server port | `6070` |
| `configmap.data.node.feed.input.url` | Feed input url | `""` |
| `configmap.data.node.feed.input.reconnect-initial-backoff` | Feed input reconnect initial backoff | `50ms` |
| `configmap.data.node.feed.input.reconnect-maximum-backoff` | Feed input reconnect maximum backoff | `800ms` |
| `configmap.data.node.feed.input.timeout` | Feed input timeout | `10s` |
| `configmap.data.node.feed.output.addr` | Feed output address | `0.0.0.0` |
| `configmap.data.node.feed.output.port` | Feed output port | `9642` |

## Configuration Options
The following table lists the exhaustive configurable parameters that can be applied as part of the configmap (nested under `configmap.data`) or as standalone cli flags.
Expand Down
2 changes: 1 addition & 1 deletion charts/relay/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ serviceMonitor:
portName: metrics
path: /debug/metrics/prometheus
interval: 5s
relabelings: {}
relabelings: []

## @param perReplicaService.enabled Enable per replica service
## @param perReplicaService.publishNotReadyAddresses Publish not ready addresses
Expand Down

0 comments on commit f85b412

Please sign in to comment.