opensourcemirror
/
cockpit
mirror of https://github.com/cockpit-project/cockpit.git
1
0
Fork 0
Code Issues Releases Wiki Activity

systemd: Warn if not connected to Insights 

The warning will only appear when the Subscriptions page announces in
its manifest that it actually supports connecting to Insights.

Closes #12793
This commit is contained in:
Marius Vollmer 2019-09-13 17:04:36 +03:00 committed by Martin Pitt
parent 39ec776e17
commit 48c026f698
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/systemd/host.js
View File

@ -566,6 +566,22 @@ PageServer.prototype = {
refresh_os_updates_state();
});
var insights_client_timer = service.proxy("insights-client.timer");
function refresh_insights_status() {
const subfeats = (cockpit.manifests.subscriptions && cockpit.manifests.subscriptions.features) || { };
if (subfeats.insights && insights_client_timer.exists && !insights_client_timer.enabled) {
$("#insights_icon").attr("class", "pficon pficon-warning-triangle-o");
set_page_link("#insights_text", "subscriptions", _("Not connected to Insights"));
$("#insights_icon, #insights_text").show();
} else {
$("#insights_icon, #insights_text").hide();
}
}
$(insights_client_timer).on("changed", refresh_insights_status);
refresh_insights_status();
// Only link from graphs to available pages
set_page_link("#link-disk", "storage", _("Disk I/O"));
set_page_link("#link-network", "network", _("Network Traffic"));

7
pkg/systemd/index.html
View File

@ -99,8 +99,15 @@
<span id="system_information_os_text"></span>
<div role="group" class="system-information-updates">
<div>
<span id="system_information_updates_icon" hidden></span>
<span id="system_information_updates_text"></span>
</div>
<br>
<div>
<span id="insights_icon"></span>
<span id="insights_text"></span>
</div>
</div>
<label class="control-label" for="system-ssh-keys-link" translatable="yes">Secure Shell Keys</label>

17
test/verify/check-system-info
View File

@ -625,6 +625,22 @@ fi
self.allow_authorize_journal_messages()
self.allow_restart_journal_messages()
@allowImage("insights-client only on RHEL", "rhel-8-1", "rhel-7-8")
def testInsightsWarning(self):
m = self.machine
b = self.browser
# Pretend that the Subscriptions page can do Insights stuff
m.write("/usr/share/cockpit/subscription-manager/override.json", '{ "features": { "insights": true } }')
self.login_and_go('/system')
m.execute("systemctl disable insights-client.timer")
b.wait_text("#insights_text", "Not connected to Insights")
m.execute("systemctl enable insights-client.timer")
b.wait_not_visible("#insights_text")
class TestPcp(packagelib.PackageCase):
@skipImage("cockpit-system doesn't have the install-on-demand feature")
@ -670,6 +686,5 @@ class TestPcp(packagelib.PackageCase):
b.wait_present("#server-pmlogger-switch input:not(:disabled)")
b.wait_present("#server-pmlogger-switch input:checked")
if __name__ == '__main__':
test_main()