diff --git a/controllers/libs/base/static/images.yaml b/controllers/libs/base/static/images.yaml index f71fe7d..06231e1 100644 --- a/controllers/libs/base/static/images.yaml +++ b/controllers/libs/base/static/images.yaml @@ -4,28 +4,28 @@ images: - name: zuul-scheduler container: quay.io/software-factory/zuul-scheduler - version: 11.1.0-3 - source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-scheduler.container?id=d3b760e620710d0cef12e840b76bff5327eb75d5 + version: 11.1.0-4 + source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-scheduler.container?id=2e842ac6d9e577d21cd53e1c3e869409d2c04cdf - name: zuul-executor container: quay.io/software-factory/zuul-executor - version: 11.1.0-3 - source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-executor.container?id=d3b760e620710d0cef12e840b76bff5327eb75d5 + version: 11.1.0-4 + source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-executor.container?id=2e842ac6d9e577d21cd53e1c3e869409d2c04cdf - name: zuul-merger container: quay.io/software-factory/zuul-merger - version: 11.1.0-3 - source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-merger.container?id=d3b760e620710d0cef12e840b76bff5327eb75d5 + version: 11.1.0-4 + source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-merger.container?id=2e842ac6d9e577d21cd53e1c3e869409d2c04cdf - name: zuul-web container: quay.io/software-factory/zuul-web - version: 11.1.0-3 - source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-web.container?id=d3b760e620710d0cef12e840b76bff5327eb75d5 + version: 11.1.0-4 + source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-web.container?id=2e842ac6d9e577d21cd53e1c3e869409d2c04cdf - name: nodepool-launcher container: quay.io/software-factory/nodepool-launcher - version: 10.0.0-6 - source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/nodepool-launcher.container?id=d3b760e620710d0cef12e840b76bff5327eb75d5 + version: 11.0.0-2 + source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/nodepool-launcher.container?id=2e842ac6d9e577d21cd53e1c3e869409d2c04cdf - name: nodepool-builder container: quay.io/software-factory/nodepool-builder - version: 10.0.0-6 - source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/nodepool-builder.container?id=d3b760e620710d0cef12e840b76bff5327eb75d5 + version: 11.0.0-2 + source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/nodepool-builder.container?id=2e842ac6d9e577d21cd53e1c3e869409d2c04cdf - name: zookeeper container: quay.io/software-factory/zookeeper version: 3.8.4-2 diff --git a/controllers/static/nodepool/statsd_mapping.yaml.tmpl b/controllers/static/nodepool/statsd_mapping.yaml.tmpl index 35b0e4b..469bf63 100644 --- a/controllers/static/nodepool/statsd_mapping.yaml.tmpl +++ b/controllers/static/nodepool/statsd_mapping.yaml.tmpl @@ -1,4 +1,4 @@ -# Auto-generated with zuuldoc2statsdmapper.py, please check with: +# Auto-generated with zuuldoc2statsdmapper.py, please check with: # podman run --rm -v controllers/static/nodepool/statsd_mapping.yaml.tmpl:/tmp/statsd_mapping.yaml:z docker.io/prom/statsd-exporter --statsd.mapping-config=/tmp/statsd_mapping.yaml # mappings: @@ -33,6 +33,47 @@ mappings: - help: Description at https://zuul-ci.org/docs/nodepool/latest/operation.html#stat-nodepool.image_build_requests match: nodepool.image_build_requests name: nodepool_image_build_requests +- help: Description at https://zuul-ci.org/docs/nodepool/latest/operation.html#stat-nodepool.image..image_build_requests + labels: + diskimage: "$1" + match: nodepool.image.*.image_build_requests + name: nodepool_image_image_build_requests +- help: Description at https://zuul-ci.org/docs/nodepool/latest/operation.html#stat-nodepool.builder..current_builds + labels: + hostname: "$1" + match: nodepool.builder.*.current_builds + name: nodepool_builder_current_builds +- help: Description at https://zuul-ci.org/docs/nodepool/latest/operation.html#stat-nodepool.builder..current_uploads + labels: + hostname: "$1" + match: nodepool.builder.*.current_uploads + name: nodepool_builder_current_uploads +- help: Description at https://zuul-ci.org/docs/nodepool/latest/operation.html#stat-nodepool.builder..build_workers + labels: + hostname: "$1" + match: nodepool.builder.*.build_workers + name: nodepool_builder_build_workers +- help: Description at https://zuul-ci.org/docs/nodepool/latest/operation.html#stat-nodepool.builder..upload_workers + labels: + hostname: "$1" + match: nodepool.builder.*.upload_workers + name: nodepool_builder_upload_workers +- help: Description at https://zuul-ci.org/docs/nodepool/latest/operation.html#stat-nodepool.builder..image..build.state + labels: + hostname: "$1" + image: "$2" + match: nodepool.builder.*.image.*.build.state + name: nodepool_builder_image_build_state +- help: Description at https://zuul-ci.org/docs/nodepool/latest/operation.html#stat-nodepool.builder..image..provider..upload.state + labels: + hostname: "$1" + image: "$2" + provider: "$3" + match: nodepool.builder.*.image.*.provider.*.upload.state + name: nodepool_builder_image_provider_upload_state - help: Description at https://zuul-ci.org/docs/nodepool/latest/operation.html#stat-nodepool.nodes. labels: state: "$1" @@ -121,6 +162,12 @@ mappings: provider: "$1" match: nodepool.provider.*.leaked.volumes name: nodepool_provider_leaked_volumes +- help: Description at https://zuul-ci.org/docs/nodepool/latest/operation.html#stat-nodepool.provider..pool..addressable_requests + labels: + pool: "$2" + provider: "$1" + match: nodepool.provider.*.pool.*.addressable_requests + name: nodepool_provider_pool_addressable_requests - help: Description at https://zuul-ci.org/docs/nodepool/latest/operation.html#stat-nodepool.launch. labels: {} match: nodepool.launch.ready @@ -202,19 +249,19 @@ mappings: name: nodepool_launcher_zk_image_cache_playback_queue # Uncomment below after testing -# {{- range . }} -# - name: {{ .Name }} -# match: {{ .Match }} -# help: {{ .Help }}, see https://zuul-ci.org/docs/nodepool/latest/operation.html#openstack-api-metrics -# labels: -# {{- range .Labels }} -# {{ .LabelName }}: "{{ .LabelValue -}}" -# {{- end }} -# {{- end }} -# - action: drop -# match: . -# match_type: regex -# name: "dropped" +{{- range . }} +- name: {{ .Name }} + match: {{ .Match }} + help: {{ .Help }}, see https://zuul-ci.org/docs/nodepool/latest/operation.html#openstack-api-metrics + labels: +{{- range .Labels }} + {{ .LabelName }}: "{{ .LabelValue -}}" +{{- end }} +{{- end }} +- action: drop + match: . + match_type: regex + name: "dropped" - action: drop match: . diff --git a/doc/reference/CHANGELOG.md b/doc/reference/CHANGELOG.md index 8ff3607..4da7537 100644 --- a/doc/reference/CHANGELOG.md +++ b/doc/reference/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [in development] +## [v0.0.48] - 2024-11-22 + ### Added - monitoring - Updated Zuul's statsd mappings to reflect metrics issued by the applications' current versions. @@ -11,12 +13,21 @@ All notable changes to this project will be documented in this file. * zuul_tenant_pipeline_queue_branch * zuul_executor_pct_used_inodes + * nodepool_image_image_build_requests + * nodepool_builder_current_builds + * nodepool_builder_current_uploads + * nodepool_builder_build_workers + * nodepool_builder_upload_workers + * nodepool_builder_image_build_state + * nodepool_builder_image_provider_upload_state + * nodepool_provider_pool_addressable_requests - development - Document the process to update a container ### Changed - security: bumped cert-manager go dependency to v1.15.4 +- nodepool: update version to 11.0.0 ### Deprecated ### Removed