From: Ernesto Puerta <37327689+epuertat@users.noreply.github.com>
Date: Wed, 16 Mar 2022 13:06:55 +0000 (+0100)
Subject: Merge pull request #44751 from rhcs-dashboard/introduce-logging-containers
X-Git-Tag: v18.0.0~1249
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8ba5d0f37d5dde66785c47cd4b84be4f0b7eaeb;p=ceph.git

Merge pull request #44751 from rhcs-dashboard/introduce-logging-containers

mgr/cephadm: introduce centralized logging in Dashboard using Loki and Promtail

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: rkachach <NOT@FOUND>
Reviewed-by: sunilangadi2 <NOT@FOUND>
Reviewed-by: umangachapagain <NOT@FOUND>
---

b8ba5d0f37d5dde66785c47cd4b84be4f0b7eaeb
diff --cc src/python-common/ceph/deployment/service_spec.py
index 11c05f060099,baeb7e7ff1cf..e7b6885ab1e5
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@@ -1067,9 -1055,9 +1069,10 @@@ class MonitoringSpec(ServiceSpec)
                   unmanaged: bool = False,
                   preview_only: bool = False,
                   port: Optional[int] = None,
 +                 extra_container_args: Optional[List[str]] = None,
                   ):
-         assert service_type in ['grafana', 'node-exporter', 'prometheus', 'alertmanager']
+         assert service_type in ['grafana', 'node-exporter', 'prometheus', 'alertmanager',
+                                 'loki', 'promtail']
  
          super(MonitoringSpec, self).__init__(
              service_type, service_id,