diff options
author | Jan Pokorný <jpokorny@redhat.com> | 2013-09-26 21:38:59 +0200 |
---|---|---|
committer | Jan Pokorný <jpokorny@redhat.com> | 2013-09-26 21:38:59 +0200 |
commit | 4104e389b278a34f6635d41c44173928a50a8f5b (patch) | |
tree | c5d170be3bf249291d32457cf7367f8b1acbcbe2 | |
parent | 0c709b2bab6e4d65d55542ef9d9986f72bb7fb95 (diff) | |
download | cluster-overview-4104e389b278a34f6635d41c44173928a50a8f5b.tar.gz cluster-overview-4104e389b278a34f6635d41c44173928a50a8f5b.tar.xz cluster-overview-4104e389b278a34f6635d41c44173928a50a8f5b.zip |
Extend tracked properties
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rw-r--r-- | lib.py | 15 | ||||
-rw-r--r-- | lib_cman.py | 53 |
2 files changed, 58 insertions, 10 deletions
@@ -162,6 +162,7 @@ def xdot_graph(*args, **kwargs): # create the resulting markup cls = REGISTRY[element.url.split('class://', 1)[1]] markup = "" + # XXX: sort the keys in dicts? if hasattr(cls, 'summary'): markup += "<b>" + cls.summary + "</b>\n\n" if hasattr(cls, 'web'): @@ -169,7 +170,7 @@ def xdot_graph(*args, **kwargs): if hasattr(cls, 'repo'): markup += "repository:\n" for name, value in cls.repo.iteritems(): - markup += "* " + name + ": <u>" + value + "</u>\n" + markup += "* " + name + ": <u>" + str(value) + "</u>\n" markup += '\n' if hasattr(cls, 'man'): markup += "man:\n" @@ -179,7 +180,17 @@ def xdot_graph(*args, **kwargs): if hasattr(cls, 'ids'): markup += "identifiers:\n" for name, value in cls.ids.iteritems(): - markup += "* " + name + ": <i>" + value + "</i>\n" + markup += "* " + name + ": <i>" + str(value) + "</i>\n" + markup += '\n' + if hasattr(cls, 'secprops'): + markup += "security properties:\n" + for name, value in cls.secprops.iteritems(): + markup += "* " + name + ": <i>" + str(value) + "</i>\n" + markup += '\n' + if hasattr(cls, 'miscprops'): + markup += "miscellaneous properties:\n" + for name, value in cls.miscprops.iteritems(): + markup += "* " + name + ": <i>" + str(value) + "</i>\n" markup += '\n' markup = markup.rstrip('\n') print pango.parse_markup(markup)[1].join(2 * ['\n' + 3*'=' + '\n']) diff --git a/lib_cman.py b/lib_cman.py index 60a0e63..8da2cba 100644 --- a/lib_cman.py +++ b/lib_cman.py @@ -21,10 +21,10 @@ class CmanRGManager(Daemon): repo = dict( git='git://git.fedorahosted.org/git/cluster.git', web='https://git.fedorahosted.org/cgit/cluster.git', - ml='https://lists.fedorahosted.org/mailman/listinfo/cluster-commits' + ml='https://lists.fedorahosted.org/mailman/listinfo/cluster-commits', ) man = [ - 'rgmanager(8)' + 'rgmanager(8)', ] srpm = 'rgmanager' rpm = 'rgmanager' @@ -40,7 +40,7 @@ class CmanClustat(Executable): repo = dict( git='git://git.fedorahosted.org/git/cluster.git', web='https://git.fedorahosted.org/cgit/cluster.git', - ml='https://lists.fedorahosted.org/mailman/listinfo/cluster-commits' + ml='https://lists.fedorahosted.org/mailman/listinfo/cluster-commits', ) man = [ 'clustat(8)' @@ -59,10 +59,10 @@ class CmanCmanTool(Executable): repo = dict( git='git://git.fedorahosted.org/git/cluster.git', web='https://git.fedorahosted.org/cgit/cluster.git', - ml='https://lists.fedorahosted.org/mailman/listinfo/cluster-commits' + ml='https://lists.fedorahosted.org/mailman/listinfo/cluster-commits', ) man = [ - 'cman_tool(8)' + 'cman_tool(8)', ] ids = dict( srpm='cluster', @@ -83,13 +83,23 @@ class CmanRicci(Daemon): web='https://git.fedorahosted.org/cgit/conga.git', ) man = [ - 'ricci(8)' + 'ricci(8)', ] ids = dict( srpm='ricci', rpm='ricci', rhbz='ricci', ) + secprops = dict( + euser='ricci', + egroup='root', + label='unconfined_u:system_r:ricci_t:s0', + ) + miscprops = dict( + common_thread_cnt=1, + nice=-1, + ppid=1, + ) class CmanCcs(Executable): @@ -105,7 +115,7 @@ class CmanCcs(Executable): web='https://github.com/feist/ccs', ) man = [ - 'ccs(8)' + 'ccs(8)', ] ids = dict( srpm='ricci', @@ -125,7 +135,7 @@ class CmanCcsSync(Executable): web='https://git.fedorahosted.org/cgit/conga.git', ) man = [ - 'ccs_sync(8)' + 'ccs_sync(8)', ] ids = dict( srpm='ricci', @@ -152,6 +162,16 @@ class CmanLuci(Daemon): rpm='luci', rhbz='luci', ) + secprops = dict( + euser='luci', + egroup='luci', + label='system_u:system_r:initrc_t:s0', + ) + miscprops = dict( + common_thread_cnt=11, # can be really variable + nice=10, + ppid=1, + ) class CmanModclusterd(Daemon): @@ -169,6 +189,16 @@ class CmanModclusterd(Daemon): rpm='modcluster', rhbz='clustermon', ) + secprops = dict( + euser='root', + egroup='root', + label='system_u:system_r:ricci_modclusterd_t:s0', + ) + miscprops = dict( + common_thread_cnt=3, + nice=-1, + ppid=1, + ) class CmanModcluster(Executable): @@ -186,3 +216,10 @@ class CmanModcluster(Executable): rpm='modcluster', rhbz='clustermon', ) + secprops = dict( + euser='', + egroup='', + label='', + ) + + |