Merge pull request #9 from statusengine/3.7

3.7

Author: nook24

.gitignore

@@ -3,4 +3,5 @@ build
 ._*
 datenschutz.html
 impressum.html
-.idea/
+.idea/
+spress.phar

config.yml

@@ -56,11 +56,15 @@ bing_verify:
 # Page menus
 top_menu:
     - { name: Getting Started, url: "/getting_started", icon: "fa fa-play", anchors: ["Overview", "Components", "Requirements", "Quick start", "Performance data"] }
-    - { name: Broker Module, url: "/broker", icon: "fa fa-cogs", anchors: ["Overview", "Scale out to Multiple Nodes", "Supported Monitoring Tools", "Installation", "Broker Options", "OCSP and OCHP", "How to update", "Debug Broker Module"] }
-    - { name: Worker, url: "/worker", icon: "fa fa-spinner", anchors: ["Overview", "Scale out to Multiple Nodes", "Requirements", "Installation", "Database", "Configuration", "Configure Performance Data", "Start Statusengine Worker", "Cleanup database", "Manage Cluster Nodes", "Get Metrics", "In-memory", "How to update", "Debugging"] }
+    - { name: Broker Module, url: "/broker", icon: "fa fa-cogs", anchors: ["Overview", "Scale out to Multiple Nodes", "Supported Monitoring Tools", "Installation", "Broker Configuration", "OCSP and OCHP", "How to update", "Debug Broker Module"] }
+    - { name: Legacy Broker Module, url: "/broker_old", icon: "fa fa-cogs", anchors: ["Overview", "Scale out to Multiple Nodes", "Supported Monitoring Tools", "Installation", "Broker Options", "OCSP and OCHP", "How to update", "Debug Broker Module"] }
+    - { name: Worker, url: "/worker", icon: "fa fa-spinner", anchors: ["Overview", "Scale out to Multiple Nodes", "Requirements", "Installation", "Database", "Configuration", "Configure Performance Data", "Start Statusengine Worker", "Cleanup database", "Manage Cluster Nodes", "Get Metrics", "In-memory", "How to update", "Update to 3.7", "Debugging"] }
     - { name: Statusengine UI, url: "/ui", icon: "fa fa-desktop", anchors: ["Overview", "Features", "Installation", "Configuration", "First user", "HTTPS", "Apache Example Config", "Nginx Example Config", "PHP built-in server", "Manage users", "Ui Settings", "How to update"] }
     - { name: Tutorials, url: "/tutorials", icon: "fa fa-graduation-cap", anchors: [] }
     - { name: Demo, url: "https://demo.statusengine.org", icon: "fa fa-desktop", anchors: [] }
     - { name: Roadmap, url: "/roadmap", icon: "fa fa-map-marker", anchors: [] }
     - { name: Old Stable (2.x), url: "/oldstable", icon: "fa fa-code", anchors: [] }
     - { name: Misc, url: "/misc", icon: "fa fa-folder-open-o", anchors: ["3rd party extensions", "Logos", "Wallpapers"] }
+
+show_in_more_top_menu: ["Legacy Broker Module", "Roadmap", "Old Stable (2.x)", "Misc"]
+

src/content/assets/css/style.css

@@ -107,3 +107,7 @@
     padding-top: 10px;
 }
 
+
+.min-height-150{
+    min-height: 150px;
+}

src/content/assets/img/roadmap/external_links.png

@@ -1,28 +1,49 @@
 angular.module('StatusengineDocs')
 
     .controller("BrokerController", function ($scope) {
-        $scope.selectedOs = 'bionic';
-        
+        $scope.selectedOs = 'focal';
+        $scope.selectedCore = 'naemon';
+        $scope.selectedQueue = 'gearman'; // rabbitmq
+
         $scope.commands = {
-            bionic: {
-                dependencies: 'apt-get install git gearman-job-server libgearman-dev gearman-tools uuid-dev libjson-c-dev manpages-dev build-essential libglib2.0-dev',
-                restartMonitoring: 'systemctl restart naemon'
-            },
-            xenial: {
-                dependencies: 'apt-get install git gearman-job-server libgearman-dev gearman-tools uuid-dev libjson-c-dev manpages-dev build-essential libglib2.0-dev',
-                restartMonitoring: 'systemctl restart naemon'
-            },
-            trusty: {
-                dependencies: 'apt-get install git gearman-job-server libgearman-dev gearman-tools uuid-dev libjson-c-dev manpages-dev build-essential libglib2.0-dev',
-                restartMonitoring: 'service naemon restart'
+            focal: {
+                dependencies: 'apt-get install git python3-pip gcc g++ cmake build-essential libglib2.0-dev libgearman-dev uuid-dev libuchardet-dev libjson-c-dev pkg-config libssl-dev librabbitmq-dev',
+                pip: 'pip3 install meson ninja',
+                restartMonitoring: 'systemctl restart naemon',
+                queueDep: {
+                    rabbitmq: 'rabbitmq-server',
+                    gearman: 'gearman-job-server'
+                }
             },
-            centos7: {
-                dependencies: 'yum install git gearmand libgearman-devel libuuid-devel json-c-devel glib2-devel',
-                restartMonitoring: 'systemctl restart naemon'
+            bionic: {
+                dependencies: 'apt-get install git python3-pip gcc g++ cmake build-essential libglib2.0-dev libgearman-dev uuid-dev libuchardet-dev libjson-c-dev pkg-config libssl-dev librabbitmq-dev',
+                pip: 'pip3 install meson ninja',
+                restartMonitoring: 'systemctl restart naemon',
+                queueDep: {
+                    rabbitmq: 'rabbitmq-server',
+                    gearman: 'gearman-job-server'
+                }
             },
             centos8: {
-                dependencies: 'yum install git gearmand libgearman-devel libuuid-devel json-c-devel glib2-devel',
-                restartMonitoring: 'systemctl restart naemon'
+                dependencies: 'yum install git python-pip gcc gcc-c++ cmake3 pkgconfig librabbitmq-devel libgearman-devel libuchardet-devel json-c-devel openssl-devel glib2-devel',
+                pip: 'pip install meson ninja',
+                restartMonitoring: 'systemctl restart naemon',
+                queueDep: {
+                    rabbitmq: 'rabbitmq-server',
+                    gearman: 'gearman-job-server'
+                }
             }
         };
+
+        $scope.$watch('selectedOs', function(){
+            $scope.hasSystemd = $scope.selectedOs !== 'trusty';
+            
+            $scope.apacheConfig = '/etc/apache2/sites-available/statusengine-ui.conf';
+            $scope.nginxConfig = '/etc/nginx/sites-available/statusengine-ui';
+            if($scope.selectedOs === 'centos7'){
+                $scope.apacheConfig = '/etc/httpd/conf.d/statusengine-ui.conf';
+                $scope.nginxConfig = '/etc/nginx/conf.d/statusengine-ui.conf'
+            }
+            
+        });
     });

src/content/assets/img/tutorials/cerebro-example-focal.png

@@ -0,0 +1,28 @@
+angular.module('StatusengineDocs')
+
+    .controller("BrokerOldController", function ($scope) {
+        $scope.selectedOs = 'bionic';
+
+        $scope.commands = {
+            bionic: {
+                dependencies: 'apt-get install git gearman-job-server libgearman-dev gearman-tools uuid-dev libjson-c-dev manpages-dev build-essential libglib2.0-dev',
+                restartMonitoring: 'systemctl restart naemon'
+            },
+            xenial: {
+                dependencies: 'apt-get install git gearman-job-server libgearman-dev gearman-tools uuid-dev libjson-c-dev manpages-dev build-essential libglib2.0-dev',
+                restartMonitoring: 'systemctl restart naemon'
+            },
+            trusty: {
+                dependencies: 'apt-get install git gearman-job-server libgearman-dev gearman-tools uuid-dev libjson-c-dev manpages-dev build-essential libglib2.0-dev',
+                restartMonitoring: 'service naemon restart'
+            },
+            centos7: {
+                dependencies: 'yum install git gearmand libgearman-devel libuuid-devel json-c-devel glib2-devel',
+                restartMonitoring: 'systemctl restart naemon'
+            },
+            centos8: {
+                dependencies: 'yum install git gearmand libgearman-devel libuuid-devel json-c-devel glib2-devel',
+                restartMonitoring: 'systemctl restart naemon'
+            }
+        };
+    });

src/content/assets/img/tutorials/grafana-elasticsearch7-datasource.png

@@ -1,11 +1,20 @@
 angular.module('StatusengineDocs')
 
     .controller("UiController", function ($scope) {
-        $scope.selectedOs = 'bionic';
+        $scope.selectedOs = 'focal';
         $scope.hasSystemd = true;
 
 
         $scope.commands = {
+            focal: {
+                dependencies: 'apt-get install git php-cli php-zip php-mysql php-ldap php-json',
+                apache2: 'apt-get install apache2 libapache2-mod-php',
+                apache2Restart: 'systemctl restart apache2.service',
+                nginx: 'apt-get install nginx php-fpm',
+                phpFpmRestart: 'systemctl restart php7.4-fpm',
+                fpmConfigPath: '/etc/php/7.4/fpm/pool.d/www.conf',
+                nginxRestart: 'systemctl restart nginx'
+            },
             bionic: {
                 dependencies: 'apt-get install git php-cli php-zip php-mysql php-ldap php-json',
                 apache2: 'apt-get install apache2 libapache2-mod-php',

src/content/assets/img/tutorials/grafana-elasticsearch7-query.png

@@ -1,11 +1,16 @@
 angular.module('StatusengineDocs')
 
     .controller("WorkerController", function ($scope) {
-        $scope.selectedOs = 'bionic';
+        $scope.selectedOs = 'focal';
         $scope.hasSystemd = true;
 
 
         $scope.commands = {
+            focal: {
+                dependencies: 'apt-get install git php-cli php-zip php-redis redis-server php-mysql php-json php-bcmath php-mbstring unzip',
+                stopStatusengineWorker: 'systemctl stop statusengine',
+                startStatusengineWorker: 'systemctl start statusengine'
+            },
             bionic: {
                 dependencies: 'apt-get install git php-cli php-zip php-redis redis-server php-mysql php-json php-gearman php-bcmath php-mbstring unzip',
                 stopStatusengineWorker: 'systemctl stop statusengine',