script & package log dir content added to support bundle; /tmp prefix…

… removed on support bundle creation from path (#1694)

.gitignore

@@ -13,7 +13,7 @@
 data/etc/storage.json
 data/etc/certs/*
 data/var
-data/tmp
+data/support
 data/scripts
 data/plugins
 data/snapshots

python/foglamp/services/core/api/support.py

@@ -165,8 +165,8 @@ async def get_syslog_entries(request):
 
 def _get_support_dir():
     if _FOGLAMP_DATA:
-        support_dir = os.path.expanduser(_FOGLAMP_DATA + '/tmp/support')
+        support_dir = os.path.expanduser(_FOGLAMP_DATA + '/support')
     else:
-        support_dir = os.path.expanduser(_FOGLAMP_ROOT + '/data/tmp/support')
+        support_dir = os.path.expanduser(_FOGLAMP_ROOT + '/data/support')
 
     return support_dir

python/foglamp/services/core/support.py

@@ -21,6 +21,8 @@
 from foglamp.services.core.connect import *
 from foglamp.common import logger
 from foglamp.services.core.api.service import get_service_records
+from foglamp.common.common import _FOGLAMP_ROOT, _FOGLAMP_DATA
+
 
 __author__ = "Amarendra K Sinha"
 __copyright__ = "Copyright (c) 2017 OSIsoft, LLC"
@@ -30,6 +32,7 @@
 _LOGGER = logger.setup(__name__)
 _NO_OF_FILES_TO_RETAIN = 3
 _SYSLOG_FILE = '/var/log/syslog'
+_PATH = _FOGLAMP_DATA if _FOGLAMP_DATA else _FOGLAMP_ROOT + '/data'
 
 if ('centos' in platform.platform()) or ('redhat' in platform.platform()):
     _SYSLOG_FILE = '/var/log/messages'
@@ -71,6 +74,8 @@ async def build(self):
                 self.add_service_registry(pyz, file_spec)
                 self.add_machine_resources(pyz, file_spec)
                 self.add_psinfo(pyz, file_spec)
+                self.add_script_dir_content(pyz)
+                self.add_package_log_dir_content(pyz)
             finally:
                 pyz.close()
         except Exception as ex:
@@ -177,3 +182,18 @@ def add_psinfo(self, pyz, file_spec):
             "runningPythonProcesses": c
         }
         self.write_to_tar(pyz, temp_file, data)
+
+    def add_script_dir_content(self, pyz):
+        script_file_path = _PATH + '/scripts'
+        if os.path.exists(script_file_path):
+            # recursively 'true' by default and __pycache__ dir excluded
+            pyz.add(script_file_path, arcname='scripts', filter=self.exclude_pycache)
+
+    def add_package_log_dir_content(self, pyz):
+        script_package_logs_path = _PATH + '/logs'
+        if os.path.exists(script_package_logs_path):
+            # recursively 'true' by default and __pycache__ dir excluded
+            pyz.add(script_package_logs_path, arcname='package_logs', filter=self.exclude_pycache)
+
+    def exclude_pycache(self, tar_info):
+        return None if '__pycache__' in tar_info.name else tar_info