Enh: move core packs to it's own level. If works, then make it read only

naparuba · Jul 23, 2018 · 37ba22c · 37ba22c
1 parent d0011af
commit 37ba22c
Show file tree

Hide file tree

Showing 79 changed files with 11 additions and 8 deletions.
diff --git a/...tion/packs/core-cli-agent/cli/__init__.py → ...tion/packs/core-cli-agent/cli/__init__.py b/...tion/packs/core-cli-agent/cli/__init__.py → ...tion/packs/core-cli-agent/cli/__init__.py
diff --git a/...iguration/packs/core-cli-agent/cli/cli.py → ...iguration/packs/core-cli-agent/cli/cli.py b/...iguration/packs/core-cli-agent/cli/cli.py → ...iguration/packs/core-cli-agent/cli/cli.py
diff --git a/...guration/packs/core-cli-agent/package.yml → ...guration/packs/core-cli-agent/package.yml b/...guration/packs/core-cli-agent/package.yml → ...guration/packs/core-cli-agent/package.yml
diff --git a/...t/tutorials/agent-info/tutorial-data.json → ...t/tutorials/agent-info/tutorial-data.json b/...t/tutorials/agent-info/tutorial-data.json → ...t/tutorials/agent-info/tutorial-data.json
diff --git a/...i-agent/tutorials/agent-info/tutorial.yml → ...i-agent/tutorials/agent-info/tutorial.yml b/...i-agent/tutorials/agent-info/tutorial.yml → ...i-agent/tutorials/agent-info/tutorial.yml
diff --git a/.../tutorials/agent-start/tutorial-data.json → .../tutorials/agent-start/tutorial-data.json b/.../tutorials/agent-start/tutorial-data.json → .../tutorials/agent-start/tutorial-data.json
diff --git a/...-agent/tutorials/agent-start/tutorial.yml → ...-agent/tutorials/agent-start/tutorial.yml b/...-agent/tutorials/agent-start/tutorial.yml → ...-agent/tutorials/agent-start/tutorial.yml
diff --git a/...packs/core-cli-collectors/cli/__init__.py → ...packs/core-cli-collectors/cli/__init__.py b/...packs/core-cli-collectors/cli/__init__.py → ...packs/core-cli-collectors/cli/__init__.py
diff --git a/...tion/packs/core-cli-collectors/cli/cli.py → ...tion/packs/core-cli-collectors/cli/cli.py b/...tion/packs/core-cli-collectors/cli/cli.py → ...tion/packs/core-cli-collectors/cli/cli.py
diff --git a/...ion/packs/core-cli-collectors/package.yml → ...ion/packs/core-cli-collectors/package.yml b/...ion/packs/core-cli-collectors/package.yml → ...ion/packs/core-cli-collectors/package.yml
diff --git a/...packs/core-cli-compliance/cli/__init__.py → ...packs/core-cli-compliance/cli/__init__.py b/...packs/core-cli-compliance/cli/__init__.py → ...packs/core-cli-compliance/cli/__init__.py
diff --git a/...tion/packs/core-cli-compliance/cli/cli.py → ...tion/packs/core-cli-compliance/cli/cli.py b/...tion/packs/core-cli-compliance/cli/cli.py → ...tion/packs/core-cli-compliance/cli/cli.py
diff --git a/...ion/packs/core-cli-compliance/package.yml → ...ion/packs/core-cli-compliance/package.yml b/...ion/packs/core-cli-compliance/package.yml → ...ion/packs/core-cli-compliance/package.yml
diff --git a/...packs/core-cli-dashboards/cli/__init__.py → ...packs/core-cli-dashboards/cli/__init__.py b/...packs/core-cli-dashboards/cli/__init__.py → ...packs/core-cli-dashboards/cli/__init__.py
diff --git a/...tion/packs/core-cli-dashboards/cli/cli.py → ...tion/packs/core-cli-dashboards/cli/cli.py b/...tion/packs/core-cli-dashboards/cli/cli.py → ...tion/packs/core-cli-dashboards/cli/cli.py
diff --git a/...s/core-cli-dashboards/cli/dashing-LICENSE → ...s/core-cli-dashboards/cli/dashing-LICENSE b/...s/core-cli-dashboards/cli/dashing-LICENSE → ...s/core-cli-dashboards/cli/dashing-LICENSE
diff --git a/.../packs/core-cli-dashboards/cli/dashing.py → .../packs/core-cli-dashboards/cli/dashing.py b/.../packs/core-cli-dashboards/cli/dashing.py → .../packs/core-cli-dashboards/cli/dashing.py
diff --git a/...ion/packs/core-cli-dashboards/package.yml → ...ion/packs/core-cli-dashboards/package.yml b/...ion/packs/core-cli-dashboards/package.yml → ...ion/packs/core-cli-dashboards/package.yml
diff --git a/.../packs/core-cli-detectors/cli/__init__.py → .../packs/core-cli-detectors/cli/__init__.py b/.../packs/core-cli-detectors/cli/__init__.py → .../packs/core-cli-detectors/cli/__init__.py
diff --git a/...ation/packs/core-cli-detectors/cli/cli.py → ...ation/packs/core-cli-detectors/cli/cli.py b/...ation/packs/core-cli-detectors/cli/cli.py → ...ation/packs/core-cli-detectors/cli/cli.py
diff --git a/...tion/packs/core-cli-detectors/package.yml → ...tion/packs/core-cli-detectors/package.yml b/...tion/packs/core-cli-detectors/package.yml → ...tion/packs/core-cli-detectors/package.yml
diff --git a/...packs/core-cli-evaluators/cli/__init__.py → ...packs/core-cli-evaluators/cli/__init__.py b/...packs/core-cli-evaluators/cli/__init__.py → ...packs/core-cli-evaluators/cli/__init__.py
diff --git a/...tion/packs/core-cli-evaluators/cli/cli.py → ...tion/packs/core-cli-evaluators/cli/cli.py b/...tion/packs/core-cli-evaluators/cli/cli.py → ...tion/packs/core-cli-evaluators/cli/cli.py
diff --git a/...ion/packs/core-cli-evaluators/package.yml → ...ion/packs/core-cli-evaluators/package.yml b/...ion/packs/core-cli-evaluators/package.yml → ...ion/packs/core-cli-evaluators/package.yml
diff --git a/...n/packs/core-cli-executor/cli/__init__.py → ...n/packs/core-cli-executor/cli/__init__.py b/...n/packs/core-cli-executor/cli/__init__.py → ...n/packs/core-cli-executor/cli/__init__.py
diff --git a/...ration/packs/core-cli-executor/cli/cli.py → ...ration/packs/core-cli-executor/cli/cli.py b/...ration/packs/core-cli-executor/cli/cli.py → ...ration/packs/core-cli-executor/cli/cli.py
diff --git a/...ation/packs/core-cli-executor/package.yml → ...ation/packs/core-cli-executor/package.yml b/...ation/packs/core-cli-executor/package.yml → ...ation/packs/core-cli-executor/package.yml
diff --git a/...packs/core-cli-generators/cli/__init__.py → ...packs/core-cli-generators/cli/__init__.py b/...packs/core-cli-generators/cli/__init__.py → ...packs/core-cli-generators/cli/__init__.py
diff --git a/...tion/packs/core-cli-generators/cli/cli.py → ...tion/packs/core-cli-generators/cli/cli.py b/...tion/packs/core-cli-generators/cli/cli.py → ...tion/packs/core-cli-generators/cli/cli.py
diff --git a/...ion/packs/core-cli-generators/package.yml → ...ion/packs/core-cli-generators/package.yml b/...ion/packs/core-cli-generators/package.yml → ...ion/packs/core-cli-generators/package.yml
diff --git a/...ion/packs/core-cli-global/cli/__init__.py → ...ion/packs/core-cli-global/cli/__init__.py b/...ion/packs/core-cli-global/cli/__init__.py → ...ion/packs/core-cli-global/cli/__init__.py
diff --git a/...guration/packs/core-cli-global/cli/cli.py → ...guration/packs/core-cli-global/cli/cli.py b/...guration/packs/core-cli-global/cli/cli.py → ...guration/packs/core-cli-global/cli/cli.py
diff --git a/...uration/packs/core-cli-global/package.yml → ...uration/packs/core-cli-global/package.yml b/...uration/packs/core-cli-global/package.yml → ...uration/packs/core-cli-global/package.yml
diff --git a/...i-global/tutorials/cli/tutorial-data.json → ...i-global/tutorials/cli/tutorial-data.json b/...i-global/tutorials/cli/tutorial-data.json → ...i-global/tutorials/cli/tutorial-data.json
diff --git a/...ore-cli-global/tutorials/cli/tutorial.yml → ...ore-cli-global/tutorials/cli/tutorial.yml b/...ore-cli-global/tutorials/cli/tutorial.yml → ...ore-cli-global/tutorials/cli/tutorial.yml
diff --git a/...tutorials/installation/tutorial-data.json → ...tutorials/installation/tutorial-data.json b/...tutorials/installation/tutorial-data.json → ...tutorials/installation/tutorial-data.json
diff --git a/...lobal/tutorials/installation/tutorial.yml → ...lobal/tutorials/installation/tutorial.yml b/...lobal/tutorials/installation/tutorial.yml → ...lobal/tutorials/installation/tutorial.yml
diff --git a/...ion/packs/core-cli-gossip/cli/__init__.py → ...ion/packs/core-cli-gossip/cli/__init__.py b/...ion/packs/core-cli-gossip/cli/__init__.py → ...ion/packs/core-cli-gossip/cli/__init__.py
diff --git a/...guration/packs/core-cli-gossip/cli/cli.py → ...guration/packs/core-cli-gossip/cli/cli.py b/...guration/packs/core-cli-gossip/cli/cli.py → ...guration/packs/core-cli-gossip/cli/cli.py
diff --git a/...uration/packs/core-cli-gossip/package.yml → ...uration/packs/core-cli-gossip/package.yml b/...uration/packs/core-cli-gossip/package.yml → ...uration/packs/core-cli-gossip/package.yml
diff --git a/...n/packs/core-cli-kv-store/cli/__init__.py → ...n/packs/core-cli-kv-store/cli/__init__.py b/...n/packs/core-cli-kv-store/cli/__init__.py → ...n/packs/core-cli-kv-store/cli/__init__.py
diff --git a/...ration/packs/core-cli-kv-store/cli/cli.py → ...ration/packs/core-cli-kv-store/cli/cli.py b/...ration/packs/core-cli-kv-store/cli/cli.py → ...ration/packs/core-cli-kv-store/cli/cli.py
diff --git a/...ation/packs/core-cli-kv-store/package.yml → ...ation/packs/core-cli-kv-store/package.yml b/...ation/packs/core-cli-kv-store/package.yml → ...ation/packs/core-cli-kv-store/package.yml
diff --git a/...packs/core-cli-monitoring/cli/__init__.py → ...packs/core-cli-monitoring/cli/__init__.py b/...packs/core-cli-monitoring/cli/__init__.py → ...packs/core-cli-monitoring/cli/__init__.py
diff --git a/...tion/packs/core-cli-monitoring/cli/cli.py → ...tion/packs/core-cli-monitoring/cli/cli.py b/...tion/packs/core-cli-monitoring/cli/cli.py → ...tion/packs/core-cli-monitoring/cli/cli.py
diff --git a/...ion/packs/core-cli-monitoring/package.yml → ...ion/packs/core-cli-monitoring/package.yml b/...ion/packs/core-cli-monitoring/package.yml → ...ion/packs/core-cli-monitoring/package.yml
diff --git a/...tion/packs/core-cli-packs/cli/__init__.py → ...tion/packs/core-cli-packs/cli/__init__.py b/...tion/packs/core-cli-packs/cli/__init__.py → ...tion/packs/core-cli-packs/cli/__init__.py
diff --git a/...iguration/packs/core-cli-packs/cli/cli.py → ...iguration/packs/core-cli-packs/cli/cli.py b/...iguration/packs/core-cli-packs/cli/cli.py → ...iguration/packs/core-cli-packs/cli/cli.py
@@ -115,7 +115,7 @@ def do_packs_show():
     # now we read them, set it in our object
 
     from opsbro.packer import packer
-    packs = {'global': {}, 'zone': {}, 'local': {}}
+    packs = {'core': {}, 'global': {}, 'zone': {}, 'local': {}}
     for level in packer.packs:
         for pname in packer.packs[level]:
             packs[level][pname] = {'checks': {}, 'module': None, 'collectors': {}, 'generators': {}}
@@ -148,7 +148,7 @@ def do_packs_show():
         pack_level = generator.pack_level
         packs[pack_level][pack_name]['generators'][gname] = generator
 
-    for level in ('global', 'zone', 'local'):
+    for level in ('core', 'global', 'zone', 'local'):
         s1 = sprintf('Packs at level ', color='yellow', end='')
         s2 = sprintf(level, color='blue', end='')
         print_h1(s1 + s2, raw_title=True)
@@ -269,7 +269,7 @@ def do_packs_list():
     for pname in pnames:
         present_before = False
         keywords = []  # useless but make lint code check happy
-        for level in ('global', 'zone', 'local'):
+        for level in ('core', 'global', 'zone', 'local'):
             if pname in packs[level]:
                 (pack, _) = packs[level][pname]
                 if present_before:
@@ -285,7 +285,7 @@ def do_overload(pack_full_id, to_level='local'):
     packs = packer.get_packs()
     pack_level, pack_name = __split_pack_full_id(pack_full_id)
 
-    if pack_level not in ['global', 'zone']:
+    if pack_level not in ['core', 'global', 'zone']:
         logger.error('The pack level %s is not valid for the pack overload.' % pack_level)
         sys.exit(2)
     packs_from_level = packs[pack_level]
@@ -294,7 +294,7 @@ def do_overload(pack_full_id, to_level='local'):
         sys.exit(2)
     package_data, dir_name = packs[pack_level][pack_name]
 
-    if to_level not in ['zone', 'local']:
+    if to_level not in ['global', 'zone', 'local']:
         logger.error('The destination pack level %s is not valid for the pack overload.' % to_level)
         sys.exit(2)
 

diff --git a/...guration/packs/core-cli-packs/package.yml → ...guration/packs/core-cli-packs/package.yml b/...guration/packs/core-cli-packs/package.yml → ...guration/packs/core-cli-packs/package.yml
diff --git a/.../packs/core-cli-tutorials/cli/__init__.py → .../packs/core-cli-tutorials/cli/__init__.py b/.../packs/core-cli-tutorials/cli/__init__.py → .../packs/core-cli-tutorials/cli/__init__.py
diff --git a/...ation/packs/core-cli-tutorials/cli/cli.py → ...ation/packs/core-cli-tutorials/cli/cli.py b/...ation/packs/core-cli-tutorials/cli/cli.py → ...ation/packs/core-cli-tutorials/cli/cli.py
diff --git a/...tion/packs/core-cli-tutorials/package.yml → ...tion/packs/core-cli-tutorials/package.yml b/...tion/packs/core-cli-tutorials/package.yml → ...tion/packs/core-cli-tutorials/package.yml
diff --git a/...ebackends/compliancebackend_filerights.py → ...ebackends/compliancebackend_filerights.py b/...ebackends/compliancebackend_filerights.py → ...ebackends/compliancebackend_filerights.py
diff --git a/...iancebackends/compliancebackend_geturl.py → ...iancebackends/compliancebackend_geturl.py b/...iancebackends/compliancebackend_geturl.py → ...iancebackends/compliancebackend_geturl.py
diff --git a/...kends/compliancebackend_packageinstall.py → ...kends/compliancebackend_packageinstall.py b/...kends/compliancebackend_packageinstall.py → ...kends/compliancebackend_packageinstall.py
diff --git a/...ebackends/compliancebackend_repository.py → ...ebackends/compliancebackend_repository.py b/...ebackends/compliancebackend_repository.py → ...ebackends/compliancebackend_repository.py
diff --git a/...ackends/compliancebackend_system_users.py → ...ackends/compliancebackend_system_users.py b/...ackends/compliancebackend_system_users.py → ...ackends/compliancebackend_system_users.py
diff --git a/...n/packs/core-functions/module/__init__.py → ...n/packs/core-functions/module/__init__.py b/...n/packs/core-functions/module/__init__.py → ...n/packs/core-functions/module/__init__.py
diff --git a/...n/packs/core-functions/module/fdisplay.py → ...n/packs/core-functions/module/fdisplay.py b/...n/packs/core-functions/module/fdisplay.py → ...n/packs/core-functions/module/fdisplay.py
diff --git a/...tion/packs/core-functions/module/fhash.py → ...tion/packs/core-functions/module/fhash.py b/...tion/packs/core-functions/module/fhash.py → ...tion/packs/core-functions/module/fhash.py
diff --git a/...packs/core-functions/module/filesystem.py → ...packs/core-functions/module/filesystem.py b/...packs/core-functions/module/filesystem.py → ...packs/core-functions/module/filesystem.py
diff --git a/...tion/packs/core-functions/module/fldap.py → ...tion/packs/core-functions/module/fldap.py b/...tion/packs/core-functions/module/fldap.py → ...tion/packs/core-functions/module/fldap.py
diff --git a/...on/packs/core-functions/module/frandom.py → ...on/packs/core-functions/module/frandom.py b/...on/packs/core-functions/module/frandom.py → ...on/packs/core-functions/module/frandom.py
diff --git a/...n/packs/core-functions/module/fstrings.py → ...n/packs/core-functions/module/fstrings.py b/...n/packs/core-functions/module/fstrings.py → ...n/packs/core-functions/module/fstrings.py
diff --git a/...ion/packs/core-functions/module/ftimes.py → ...ion/packs/core-functions/module/ftimes.py b/...ion/packs/core-functions/module/ftimes.py → ...ion/packs/core-functions/module/ftimes.py
diff --git a/...on/packs/core-functions/module/hosting.py → ...on/packs/core-functions/module/hosting.py b/...on/packs/core-functions/module/hosting.py → ...on/packs/core-functions/module/hosting.py
diff --git a/...tion/packs/core-functions/module/logic.py → ...tion/packs/core-functions/module/logic.py b/...tion/packs/core-functions/module/logic.py → ...tion/packs/core-functions/module/logic.py
diff --git a/...ion/packs/core-functions/module/module.py → ...ion/packs/core-functions/module/module.py b/...ion/packs/core-functions/module/module.py → ...ion/packs/core-functions/module/module.py
diff --git a/...on/packs/core-functions/module/network.py → ...on/packs/core-functions/module/network.py b/...on/packs/core-functions/module/network.py → ...on/packs/core-functions/module/network.py
diff --git a/...ation/packs/core-functions/module/node.py → ...ation/packs/core-functions/module/node.py b/...ation/packs/core-functions/module/node.py → ...ation/packs/core-functions/module/node.py
diff --git a/...n/packs/core-functions/module/packages.py → ...n/packs/core-functions/module/packages.py b/...n/packs/core-functions/module/packages.py → ...n/packs/core-functions/module/packages.py
diff --git a/...ion/packs/core-functions/module/system.py → ...ion/packs/core-functions/module/system.py b/...ion/packs/core-functions/module/system.py → ...ion/packs/core-functions/module/system.py
diff --git a/...guration/packs/core-functions/package.yml → ...guration/packs/core-functions/package.yml b/...guration/packs/core-functions/package.yml → ...guration/packs/core-functions/package.yml
diff --git a/.../packs/core-gossip/collectors/__init__.py → .../packs/core-gossip/collectors/__init__.py b/.../packs/core-gossip/collectors/__init__.py → .../packs/core-gossip/collectors/__init__.py
diff --git a/...ore-gossip/collectors/collector_gossip.py → ...ore-gossip/collectors/collector_gossip.py b/...ore-gossip/collectors/collector_gossip.py → ...ore-gossip/collectors/collector_gossip.py
diff --git a/...cks/core-gossip/detectors/gossip-zone.yml → ...cks/core-gossip/detectors/gossip-zone.yml b/...cks/core-gossip/detectors/gossip-zone.yml → ...cks/core-gossip/detectors/gossip-zone.yml
diff --git a/...nfiguration/packs/core-gossip/package.yml → ...nfiguration/packs/core-gossip/package.yml b/...nfiguration/packs/core-gossip/package.yml → ...nfiguration/packs/core-gossip/package.yml
diff --git a/opsbro/cli.py b/opsbro/cli.py
@@ -293,15 +293,18 @@ def __init__(self, config, opts):
             os.mkdir(data_dir)
 
         # Then we will need to look at other directories, list from
+        # * core-configuration = fill by installation, read-only
         # * global-configration = common to all nodes
         # * zone-configuration = common to zone nodes
         # * local-configuration = on this specific node
+        core_configuration = os.path.join(data_dir, 'core-configuration')
         global_configuration = os.path.join(data_dir, 'global-configuration')
         zone_configuration = os.path.join(data_dir, 'zone-configuration')
         local_configuration = os.path.join(data_dir, 'local-configuration')
 
         # Ask the packer to load pack descriptions so it will be able to
         # give us which pack directories must be read (with good order)
+        packer.load_pack_descriptions(core_configuration, 'core')
         packer.load_pack_descriptions(global_configuration, 'global')
         packer.load_pack_descriptions(zone_configuration, 'zone')
         packer.load_pack_descriptions(local_configuration, 'local')

diff --git a/opsbro/packer.py b/opsbro/packer.py
@@ -13,7 +13,7 @@
 
 class PackManager(object):
     def __init__(self):
-        self.packs = {'global': {}, 'zone': {}, 'local': {}}
+        self.packs = {'core': {}, 'global': {}, 'zone': {}, 'local': {}}
 
         # We got an object, we can fill the http daemon part
         self.export_http()
@@ -65,7 +65,7 @@ def load_pack_descriptions(self, root_dir, level):
     def give_pack_directories_to_load(self):
         to_load_idx = set()  # used to know if we already see suck a pack
         to_load = {}
-        for level in ('local', 'zone', 'global'):
+        for level in ('local', 'zone', 'global', 'core'):
             for pname in self.packs[level]:
                 if pname in to_load_idx:
                     logger.debug('Skipping pack %s/%s to load because it was already present in a more priority level' % (level, pname))
@@ -83,7 +83,7 @@ def get_packs(self):
 
 
     def get_pack_all_topics(self, pname):
-        for level in ('local', 'zone', 'global'):
+        for level in ('local', 'zone', 'global', 'core'):
             pack = self.packs[level].get(pname, None)
             if not pack:
                 continue