diff -Nru sosreport-4.0/debian/changelog sosreport-4.0/debian/changelog --- sosreport-4.0/debian/changelog 2020-12-29 19:00:00.000000000 +0000 +++ sosreport-4.0/debian/changelog 2021-01-07 13:45:17.000000000 +0000 @@ -1,3 +1,13 @@ +sosreport (4.0-1ubuntu2.2) groovy; urgency=medium + + * d/p/0011-ceph-include-time-sync-status-for-ceph-mon.patch: + Ceph mons might get into time sync problems if ntp/chrony + isn't installed or configured correctly. Since Luminous + release, upstream support 'time-sync-status' to detect this + more easily. (LP: #1910264) + + -- Ponnuvel Palaniyappan Thu, 07 Jan 2021 13:45:17 +0000 + sosreport (4.0-1ubuntu2.1) groovy; urgency=medium [Hemanth Nakkina] diff -Nru sosreport-4.0/debian/patches/0011-ceph-include-time-sync-status-for-ceph-mon.patch sosreport-4.0/debian/patches/0011-ceph-include-time-sync-status-for-ceph-mon.patch --- sosreport-4.0/debian/patches/0011-ceph-include-time-sync-status-for-ceph-mon.patch 1970-01-01 00:00:00.000000000 +0000 +++ sosreport-4.0/debian/patches/0011-ceph-include-time-sync-status-for-ceph-mon.patch 2021-01-07 13:45:10.000000000 +0000 @@ -0,0 +1,21 @@ +Description: [ceph] include time-sync-status for ceph mon + Ceph mons might get into time sync problems if ntp/chrony + isn't installed or configured correctly. Since Luminous + release, upstream support 'time-sync-status' to detect this + more easily. +Author: Ponnuvel Palaniyappan +Origin: backport, https://github.com/sosreport/sos/commit/05c94ea7681a763cf17f57a11a0b50948b98f824 +Bug: https://github.com/sosreport/sos/issues/2356 +Bug-Ubuntu: https://launchpad.net/bugs/1910264 +Index: sosreport-4.0/sos/report/plugins/ceph.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/ceph.py ++++ sosreport-4.0/sos/report/plugins/ceph.py +@@ -108,6 +108,7 @@ class Ceph(Plugin, RedHatPlugin, UbuntuP + "fs dump", + "pg dump", + "pg stat", ++ "time-sync-status", + ] + + self.add_cmd_output([ diff -Nru sosreport-4.0/debian/patches/series sosreport-4.0/debian/patches/series --- sosreport-4.0/debian/patches/series 2020-12-29 19:00:00.000000000 +0000 +++ sosreport-4.0/debian/patches/series 2021-01-07 13:43:59.000000000 +0000 @@ -8,3 +8,4 @@ 0008-conntrack-add-conntrack-info.patch 0009-conntrack-gather-per-namespace-data.patch 0010-networking-include-ns-ip-neigh-and-ip-rule-info.patch +0011-ceph-include-time-sync-status-for-ceph-mon.patch