Skip to content

Commit bb6e68a

Browse files
committed
cephadm: samba metrics-exporter image
Samba metrics-exporter runs as a different process along-side main samba-server (sidecar) and has its own container-image. Add default image URL and option to control alternative image (where empty string implies running without metrics-exporter). Signed-off-by: Shachar Sharon <[email protected]>
1 parent 52deba6 commit bb6e68a

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/cephadm/cephadmlib/constants.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
DEFAULT_JAEGER_AGENT_IMAGE = 'quay.io/jaegertracing/jaeger-agent:1.29'
2020
DEFAULT_JAEGER_QUERY_IMAGE = 'quay.io/jaegertracing/jaeger-query:1.29'
2121
DEFAULT_SMB_IMAGE = 'quay.io/samba.org/samba-server:devbuilds-centos-amd64'
22+
DEFAULT_SMBMETRICS_IMAGE = 'quay.io/samba.org/samba-metrics:latest'
2223
DEFAULT_NGINX_IMAGE = 'quay.io/ceph/nginx:1.26.1'
2324
DEFAULT_OAUTH2_PROXY_IMAGE = 'quay.io/oauth2-proxy/oauth2-proxy:v7.6.0'
2425
DEFAULT_REGISTRY = 'docker.io' # normalize unqualified digests to this

src/pybind/mgr/cephadm/module.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ def os_exit_noop(status: int) -> None:
148148
DEFAULT_OAUTH2_PROXY = 'quay.io/oauth2-proxy/oauth2-proxy:v7.6.0'
149149
DEFAULT_JAEGER_QUERY_IMAGE = 'quay.io/jaegertracing/jaeger-query:1.29'
150150
DEFAULT_SAMBA_IMAGE = 'quay.io/samba.org/samba-server:devbuilds-centos-amd64'
151+
DEFAULT_SAMBA_METRICS_IMAGE = 'quay.io/samba.org/samba-metrics:latest'
151152
# ------------------------------------------------------------------------------
152153

153154

@@ -319,6 +320,11 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
319320
default=DEFAULT_SAMBA_IMAGE,
320321
desc='Samba/SMB container image',
321322
),
323+
Option(
324+
'container_image_samba_metrics',
325+
default=DEFAULT_SAMBA_METRICS_IMAGE,
326+
desc='Samba/SMB metrics exporter container image',
327+
),
322328
Option(
323329
'warn_on_stray_hosts',
324330
type='bool',
@@ -585,6 +591,7 @@ def __init__(self, *args: Any, **kwargs: Any):
585591
self.container_image_jaeger_collector = ''
586592
self.container_image_jaeger_query = ''
587593
self.container_image_samba = ''
594+
self.container_image_samba_metrics = ''
588595
self.warn_on_stray_hosts = True
589596
self.warn_on_stray_daemons = True
590597
self.warn_on_failed_host_check = True

0 commit comments

Comments
 (0)