Merge branch 'dev'

Author: casperr0

README.rst

@@ -103,6 +103,10 @@ NOTE: only mamonsu 2.3.4 builds for Windows.
     $ c:\mamonsu\service_win32.exe -install
     $ net start mamonsu
 
+    or
+    $ pyinstaller --onefile mamonsu_win32.spec
+    $ pyinstaller --onefile service_win32.spec
+
 Build nsis installer:
 
 .. code-block:: bash

mamonsu/lib/default_config.py

@@ -50,6 +50,8 @@ class DefaultConfig(PgsqlConfig):
     def default_config_path():
         if platform.LINUX:
             return '/etc/mamonsu/agent.conf'
+        elif platform.WINDOWS:
+            return 'agent.conf'
 
     @staticmethod
     def get_logger_level(level):
@@ -64,6 +66,6 @@ def get_logger_level(level):
     @staticmethod
     def default_report_path():
         if platform.WINDOWS:
-            return 'c:\\report.txt'
+            return 'report.txt'
         if platform.LINUX:
             return '/tmp/report.txt'

mamonsu/lib/parser.py

@@ -3,14 +3,19 @@
 from mamonsu import __version__
 from optparse import OptionParser, BadOptionError
 import mamonsu.lib.platform as platform
+from mamonsu.lib.default_config import DefaultConfig
 
 usage_msg = """
 Options:
     -a, --add-plugins  <directory>
     -c, --config       <file>
     -p, --pid          <pid-file>
-    -d                 daemonize
-        --version      output version information, then exit
+"""
+if platform.LINUX:
+    usage_msg += """    -d                 daemonize
+"""
+
+usage_msg += """        --version      output version information, then exit
         --help         show this help, then exit
 
 Export example config with default variables:
@@ -19,34 +24,7 @@
     {prog} export config <file>
 Options:
     --add-plugins <directory>
-
-Export zabbix keys for native zabbix-agent:
-Command: export zabbix-parameters
-Examples:
-    {prog} export zabbix-parameters  <file>
-Options:
-    --plugin-type <plugin_type> (pg|sys|all) by default all
-    --pg-version <pg_version> by default 10
-    --add-plugins <directory>
-    --config  <file>
-HINT: Supported version numbers are 12, 10, 11, 9.6, 9.5
-
     
-Export template for native zabbix agent:
-Command: export zabbix-template 
-Examples:
-    {prog} export zabbix-template [options] <file>
-Options:
-    --template-name <template name> by default PostgresPro-<platform name>
-    --plugin-type <plugin_type> (pg|sys|all) by default all
-    --application  <application name in template> by default App-PostgresPro-<platform name>
-    --add-plugins <directory>
-    --config  <file>
-    --old-zabbix
-By default, mamonsu exports the template for Zabbix 4.4 or higher.
-To export a template for older Zabbix versions, use the --old-zabbix option.
-
-
 Export zabbix template with additional plugins included in config file:
 Command: export template 
 Examples:
@@ -60,7 +38,6 @@
 HINT: By default, mamonsu exports the template for Zabbix 4.4 or higher.
 To export a template for older Zabbix versions, use the --old-zabbix option.
 
-
 Bootstrap DDL for monitoring:
 Command: bootstrap
 Examples:
@@ -73,7 +50,6 @@
     -U, --username <USERNAME>
     --host <PGHOST>
    
-
 Information about working mamonsu:
 Command: agent
 Examples:
@@ -83,8 +59,6 @@
 Options:
     -c, --config <file>
 
-
-
 Zabbix API toolbox:
 Command: zabbix
 Usage:
@@ -114,7 +88,7 @@
     --url=http://zabbix/web/face
     --user=WebUser
     --password=WebPassword
-        
+    
 Export metrics to zabbix server
 Command: upload
 Example:
@@ -129,6 +103,30 @@
 
 if platform.LINUX:
     usage_msg += """
+Export zabbix keys for native zabbix-agent:
+Command: export zabbix-parameters
+Examples:
+    {prog} export zabbix-parameters  <file>
+Options:
+    --plugin-type <plugin_type> (pg|sys|all) by default all
+    --pg-version <pg_version> by default 10
+    --add-plugins <directory>
+    --config  <file>
+HINT: Supported version numbers are 12, 10, 11, 9.6, 9.5
+
+Export template for native zabbix agent:
+Command: export zabbix-template
+Examples:
+    {prog} export zabbix-template [options] <file>
+Options:
+    --template-name <template name> by default PostgresPro-<platform name>
+    --plugin-type <plugin_type> (pg|sys|all) by default all
+    --application  <application name in template> by default App-PostgresPro-<platform name>
+    --add-plugins <directory>
+    --config  <file>
+    --old-zabbix
+By default, mamonsu exports the template for Zabbix 4.4 or higher.
+To export a template for older Zabbix versions, use the --old-zabbix option.
 
 Report about hardware and software:
 Command: report
@@ -144,8 +142,6 @@
     -r, --print-report
     -w, --report-path <path to file>
     
-
-
 AutoTune config and system:
 Command: tune
 Options:
@@ -158,7 +154,6 @@
 
 if platform.WINDOWS:
     usage_msg += """
-
 AutoTune config and system:
 Command: tune
 Options:
@@ -179,7 +174,6 @@ class MissOptsParser(OptionParser):
     def print_help(self, **kwargs):
         print("""
 
-
 Export example config with default variables:
 Command: export
 Examples:
@@ -248,7 +242,7 @@ def parse_args():
         usage=usage_msg,
         version='%prog {0}'.format(__version__))
     parser.add_option(
-        '-c', '--config', dest='config_file', default='/etc/mamonsu/agent.conf')
+        '-c', '--config', dest='config_file', default=DefaultConfig.default_config_path())
     # pid
     parser.add_option(
         '-p', '--pid', dest='pid', default=None)

mamonsu/lib/runner.py

@@ -13,7 +13,9 @@
 from mamonsu.lib.plugin import Plugin
 from mamonsu.lib.zbx_template import ZbxTemplate
 from mamonsu.lib.get_keys import GetKeys
-from mamonsu.plugins.system.linux.scripts import Scripts
+
+if platform.LINUX:
+    from mamonsu.plugins.system.linux.scripts import Scripts
 
 
 def start():
@@ -79,6 +81,9 @@ def quit_handler(_signo=None, _stack_frame=None):
             if not len(commands) == 2 and not len(commands) == 3:
                 print_total_help()
             if commands[1] == 'zabbix-parameters':
+                if platform.WINDOWS:
+                    print("Export of zabbix keys for native zabbix-agent is not supported on Windows systems")
+                    sys.exit(10)
                 # zabbix agent keys generation
                 Plugin.Type = 'agent'  # change plugin type for template generator
                 plugins = []
@@ -149,6 +154,9 @@ def quit_handler(_signo=None, _stack_frame=None):
                     print(" {0} ".format(e))
                     sys.exit(2)
             elif commands[1] == 'zabbix-template':
+                if platform.WINDOWS:
+                    print("Export of template for native zabbix agent is not supported on Windows systems")
+                    sys.exit(10)
                 Plugin.Type = 'agent'  # change plugin type for template generator
                 if len(commands) == 2:
                     commands.append('postgrespro_agent.xml')

mamonsu/tools/agent/start.py

@@ -9,6 +9,7 @@
 
 import urllib.request as urllib
 from urllib.error import URLError, HTTPError
+from mamonsu.lib.default_config import DefaultConfig
 
 
 def run_agent():
@@ -32,7 +33,7 @@ def print_help():
         usage=usage_msg,
         version='%prog agent {0}'.format(__version__))
     parser.add_option(
-        '-c', '--config', dest='config', default='/etc/mamonsu/agent.conf',
+        '-c', '--config', dest='config', default=DefaultConfig.default_config_path(),
         help=optparse.SUPPRESS_HELP)
     args, commands = parser.parse_args()
 

mamonsu_win32.py

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+from mamonsu.lib.runner import start
+
+if __name__ == '__main__':
+    start()

mamonsu_win32.spec

@@ -0,0 +1,74 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+block_cipher = None
+
+
+a = Analysis(['mamonsu_win32.py'],
+             pathex=['C:\\Projects\\Extensions\\mamonsu'],
+             binaries=[],
+             datas=[],
+             hiddenimports=[
+                'mamonsu.plugins.pgsql.archive_command',
+                'mamonsu.plugins.pgsql.bgwriter',
+                'mamonsu.plugins.pgsql.cfs',
+                'mamonsu.plugins.pgsql.checkpoint',
+                'mamonsu.plugins.pgsql.connections',
+                'mamonsu.plugins.pgsql.databases',
+                'mamonsu.plugins.pgsql.health',
+                'mamonsu.plugins.pgsql.instance',
+                'mamonsu.plugins.pgsql.oldest',
+                'mamonsu.plugins.pgsql.pg_buffercache',
+                'mamonsu.plugins.pgsql.pg_locks',
+                'mamonsu.plugins.pgsql.pg_stat_statement',
+                'mamonsu.plugins.pgsql.pg_wait_sampling',
+                'mamonsu.plugins.pgsql.plugin',
+                'mamonsu.plugins.pgsql.pool',
+                'mamonsu.plugins.pgsql.prepared_transaction',
+                'mamonsu.plugins.pgsql.relations_size',
+                'mamonsu.plugins.pgsql.xlog',
+                'mamonsu.plugins.system.windows.cpu',
+                'mamonsu.plugins.system.windows.disk_stats',
+                'mamonsu.plugins.system.windows.helpers',
+                'mamonsu.plugins.system.windows.memory',
+                'mamonsu.plugins.system.windows.network',
+                'mamonsu.lib.senders.log',
+                'mamonsu.lib.senders.zbx',
+                'mamonsu.tools.agent.agent',
+                'mamonsu.tools.agent.start',
+                'mamonsu',
+                'mamonsu.plugins',
+                'mamonsu.plugins.pgsql',
+                'mamonsu.plugins.system.windows',
+                'mamonsu.tools.agent',
+                'mamonsu.tools.bootstrap',
+                'mamonsu.tools.report',
+                'mamonsu.tools.sysinfo',
+                'mamonsu.tools.tune',
+                'mamonsu.tools.zabbix_cli',
+                'mamonsu.plugins.common.health',
+                'mamonsu.plugins.common',
+                'win32timezone'
+             ],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          [],
+          name='mamonsu',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=True,
+          upx_exclude=[],
+          runtime_tmpdir=None,
+          console=True )