Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

quincy: dashboard: 2nd backport batch #44899

Merged
merged 21 commits into from Feb 15, 2022

Commits on Feb 9, 2022

  1. mgr/ActivePyModules: Add metadata id in dump_server()

    The `DaemonStateCollection` used to always contain the daemon name in its
    `DaemonKey`, but since ceph#40220 (or more specifically
    afc3375), the RadosGW registers with its
    instance ID instead (`rados.get_instance_id()`).
    
    As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the
    `prometheus` module have their `ceph_daemon` label include that ID instead of
    the daemon name, e.g.
    
    ```
    ceph_rgw_req{ceph_daemon="rgw.127202"}
    ```
    
    instead of
    
    ```
    ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"}
    ```
    
    This commit adds the daemon name from `state->metadata["id"]` if available, as
    `service.name` in the JSON document returned by `dump_server()`.
    
    Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
    (cherry picked from commit 2db1aaa)
    BenoitKnecht authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    8b44c45 View commit details
    Browse the repository at this point in the history
  2. pybind/mgr/mgr_module.py: Set instance_id label for rgw

    Now that the RadosGW returns its instance ID instead of its daemon name,
    replace the `ceph_daemon` label with an `instance_id` label on the `rgw`
    metrics.
    
    Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
    (cherry picked from commit 9f6573b)
    BenoitKnecht authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    d924cf6 View commit details
    Browse the repository at this point in the history
  3. pybind/mgr/prometheus: Add instance_id metadata for rgw

    In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the
    value before ceph#40220, we need to add the `instance_id` label to the
    `ceph_rgw_metadata` metric.
    
    This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric
    using the following PromQL query, for instance:
    
    ```
    ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata
    ```
    
    Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
    (cherry picked from commit 01b42c1)
    BenoitKnecht authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    5441b8d View commit details
    Browse the repository at this point in the history
  4. monitoring/grafana: Update radosgw dashboards

    With the `ceph_daemon` label now replaced by `instance_id` on all `ceph_rgw_*`
    metrics, we need to update Grafana dashboards get that label back from
    `ceph_rgw_metadata` using this type of construct:
    
    ```
    ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata
    ```
    
    Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
    (cherry picked from commit adc36de)
    BenoitKnecht authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    8a8c35f View commit details
    Browse the repository at this point in the history
  5. monitoring/grafana: Add tests for radosgw panels

    Some of the expressions modified in c402903 were not covered by any tests,
    especially those in the `radosgw-detail.json` dashboard.
    
    This commit fills in those gaps.
    
    Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
    (cherry picked from commit 2daaa05)
    BenoitKnecht authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    57591a3 View commit details
    Browse the repository at this point in the history
  6. spec: debian: add golang as build dependency

    Add golang as a build dependency to build golang project in the test
    for monitoring/ceph-mixin.
    
    Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
    (cherry picked from commit e102620)
    MrFreezeex authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    9b4f43f View commit details
    Browse the repository at this point in the history
  7. mgr/dashboard: monitoring: refactor into ceph-mixin

    Mixin is a way to bundle dashboards, prometheus rules and alerts into
    jsonnet package. Shifting to mixin will allow easier integration with
    monitoring automation that some users may use.
    
    This commit moves `/monitoring/grafana/dashboards` and
    `/monitoring/prometheus` to `/monitoring/ceph-mixin`. Prometheus alerts
    was also converted to Jsonnet using an automated way (from yaml to json
    to jsonnet). This commit minimises any change made to the generated files
    and should not change neithers the dashboards nor the Prometheus alerts.
    
    In the future some configuration will also be added to jsonnet to add
    more functionalities to the dashboards or alerts (i.e.: multi cluster).
    
    Fixes: https://tracker.ceph.com/issues/53374
    Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
    (cherry picked from commit 98236e3)
    MrFreezeex authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    57653c8 View commit details
    Browse the repository at this point in the history
  8. spec: debian: monitoring: build jsonnet from source to use 0.18.0

    As this new version is recently released it's still not in every distro
    we use. We now build jsonnet from source so that we can use this new
    version of jsonnet. This commit could be reverted later on when the new
    version would be available everywhere.
    
    Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
    (cherry picked from commit ecaf907)
    MrFreezeex authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    4b1a20f View commit details
    Browse the repository at this point in the history
  9. monitoring: build jsonnet/jb only for testing

    Build jsonnet and jb in the testso that we can build ceph without
    internet access and still be able to run the test needed for monitoring
    using jsonnet tools.
    
    Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
    (cherry picked from commit 8ff1e6b)
    MrFreezeex authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    7a13f87 View commit details
    Browse the repository at this point in the history
  10. mgr/dashboard: perform daemon actions on cluster->services

    Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
    Fixes: https://tracker.ceph.com/issues/50322
    (cherry picked from commit 239f884)
    pereman2 authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    ed7750e View commit details
    Browse the repository at this point in the history
  11. cephadm/box: fix remove image tar error and cleanups

    Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
    (cherry picked from commit 71c4935)
    pereman2 authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    ecdf4d3 View commit details
    Browse the repository at this point in the history
  12. doc: update dashboard kcli test env documentation

    Fixes: https://tracker.ceph.com/issues/54105
    Signed-off-by: Nizamudeen A <nia@redhat.com>
    (cherry picked from commit 8feb2b8)
    nizamial09 authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    626a7b9 View commit details
    Browse the repository at this point in the history
  13. mgr/dashboard: cephadm e2e job: display info on error & other improve…

    …ments
    
    - Fix: ensure that on_error trap is called (display more info on error).
    - Set static IPs to VMs.
    - Remove domain in cluster definition to avoid side effects of potential dns misconfiguration.
    - Minor improvements.
    
    Fixes: https://tracker.ceph.com/issues/53991
    
    Signed-off-by: Alfonso Martínez <almartin@redhat.com>
    (cherry picked from commit 39af61e)
    alfonsomthd authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    ce27e36 View commit details
    Browse the repository at this point in the history
  14. cephadm: change shared_folder directory for prometheus and grafana

    After ceph#44059 the monitoring/prometheus
    and monitoring/grafana/dashboards directories are changed to
    monitoring/ceph-mixins. That broke the shared_folders in the cephadm
    bootstrap script.
    
    Changed all the instances of monitoring/prometheus and
    monitoring/grafana/dashboards to monitoring/ceph-mixins
    
    Also, renaming all the instances of prometheus_alerts.yaml to
    prometheus_alerts.yml.
    
    Fixes: https://tracker.ceph.com/issues/54176
    Signed-off-by: Nizamudeen A <nia@redhat.com>
    (cherry picked from commit 27592b7)
    nizamial09 authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    27c2994 View commit details
    Browse the repository at this point in the history
  15. mgr/dashboard: fix for cephadm e2e failing because of rgw commands ge…

    …tting stuck
    
    Delaying the rgw service creation in the tests until the cluster is
    healthy
    
    also changing the node_ip_offset to 110 because in the jenkins I saw
    
    Fixes: https://tracker.ceph.com/issues/54030
    Signed-off-by: Nizamudeen A <nia@redhat.com>
    (cherry picked from commit 347fb2e)
    nizamial09 authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    095eb4b View commit details
    Browse the repository at this point in the history
  16. mgr/dashboard: set appropriate baseline branch for applitools

    All the dashboard PRs are checked against a baseline branch called
    'default' in the visual regresstion testing. This will cause issues when
    testing PRs in different branches. For eg: currently our master and
    pacific has to save two different screenshots since the two of them
    differ slightly.
    
    Disabling the applitools logs as well because its too 'noisy'
    
    Fixes: https://tracker.ceph.com/issues/54190
    Signed-off-by: Nizamudeen A <nia@redhat.com>
    (cherry picked from commit 40c902a)
    nizamial09 authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    c4f403a View commit details
    Browse the repository at this point in the history
  17. mgr/dashboard: change the readFile to readFileSync

    Apparently the readFile i added in ceph#44934 is async and that's not what
    we want. so changing it to the synchronous call that is readFileSync
    
    Fixes: https://tracker.ceph.com/issues/54190
    Signed-off-by: Nizamudeen A <nia@redhat.com>
    (cherry picked from commit cbfdd55)
    nizamial09 authored and epuertat committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    3b0a397 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2022

  1. mgr/dashboard: support snmp-gateway service creation from UI

    Fixes: https://tracker.ceph.com/issues/54034
    Signed-off-by: Avan Thakkar <athakkar@redhat.com>
    (cherry picked from commit ad6fcfc)
    avanthakkar authored and epuertat committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    fc049e1 View commit details
    Browse the repository at this point in the history
  2. mgr/dashboard: add snmp destination validation

    Signed-off-by: Avan Thakkar <athakkar@redhat.com>
    (cherry picked from commit 81c93a2)
    avanthakkar authored and epuertat committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    7bc270f View commit details
    Browse the repository at this point in the history
  3. mgr/dashboard: add snmp-gateway service e2e tests

    Fixes: https://tracker.ceph.com/issues/54034
    Signed-off-by: Avan Thakkar <athakkar@redhat.com>
    (cherry picked from commit 76dcf6a)
    avanthakkar authored and epuertat committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    6760d3c View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2022

  1. mgr/dashboard:Directories Menu Can't Use on Ceph File System Dashboard

    Added exception handling to opendir() in cephfs.py for directories with no execute permission.
    
    Fixes: https://tracker.ceph.com/issues/51611
    Signed-off-by: Sarthak0702 <sarthak.0702@gmail.com>
    (cherry picked from commit ea1af54)
    Sarthak0702 authored and epuertat committed Feb 11, 2022
    Configuration menu
    Copy the full SHA
    25845f7 View commit details
    Browse the repository at this point in the history