Merge pull request #1090 from it-novum/development

openITCOCKPIT 4.1.3
it-novum · Nov 24, 2020 · 8b81f82 · 8b81f82
2 parents 40d0a17 + ab11148
commit 8b81f82
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 17 deletions.
diff --git a/config/version.php b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 
 if (!defined('OPENITCOCKPIT_VERSION')) {
-    define('OPENITCOCKPIT_VERSION', '4.1.2');
+    define('OPENITCOCKPIT_VERSION', '4.1.3');
 }
 
 return [];
diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
     "description": "",
     "main": "index.js",
     "dependencies": {
+        "@egjs/hammerjs": "^2.0.17",
         "@fortawesome/fontawesome-free": "^5.15.1",
         "@fullcalendar/bootstrap": "^4.4.2",
         "@fullcalendar/core": "^4.4.2",
@@ -22,6 +23,7 @@
         "bootstrap4c-chosen": "^1.1.1",
         "canvas-gauges": "^2.1.7",
         "chart.js": "^2.9.3",
+        "component-emitter": "^1.3.0",
         "dropzone": "^5.7.2",
         "file-saver": "^2.0.2",
         "flag-icon-css": "^3.5.0",
@@ -36,18 +38,23 @@
         "jquery-sparkline": "^2.4.0",
         "jquery-ui-dist": "^1.12.1",
         "jquery.cookie": "^1.4.1",
+        "keycharm": "^0.3.0",
         "ng-nestable": "^0.0.1",
         "node-waves": "^0.7.6",
         "noty": "^3.1.4",
         "popper.js": "^1.15.0",
+        "propagating-hammerjs": "^1.5.0",
         "rangyinputs": "^1.2.0",
         "raphael": "^2.3.0",
         "spectrum-colorpicker2": "^2.0.4",
+        "timsort": "^0.3.0",
         "tsparticles": "^1.18.0",
         "underscore": "^1.11.0",
+        "uuid": "^7.0.3",
         "vis-data": "^6.6.1",
         "vis-network": "^7.10.2",
-        "vis-timeline": "^7.3.10"
+        "vis-timeline": "^7.3.10",
+        "vis-util": "^4.0.0"
     },
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",

diff --git a/resources/locales/de_DE/default.po b/resources/locales/de_DE/default.po
@@ -7744,7 +7744,7 @@ msgid "Run as administrator (via cmd.exe)"
 msgstr "Als Administrator ausführen (über cmd.exe)"
 
 #: src/Template/Agentconnector/config.php:1218
-msgid "sc stop oitcAgentSvc && sc start oitcAgentSvc"
+msgid "sc stop openITCOCKPITAgent && sc start openITCOCKPITAgent"
 msgstr ""
 
 #: src/Template/Agentconnector/config.php:1222

diff --git a/resources/locales/default.pot b/resources/locales/default.pot
@@ -7743,7 +7743,7 @@ msgid "Run as administrator (via cmd.exe)"
 msgstr ""
 
 #: src/Template/Agentconnector/config.php:1218
-msgid "sc stop oitcAgentSvc && sc start oitcAgentSvc"
+msgid "sc stop openITCOCKPITAgent && sc start openITCOCKPITAgent"
 msgstr ""
 
 #: src/Template/Agentconnector/config.php:1222

diff --git a/resources/locales/en_US/default.po b/resources/locales/en_US/default.po
@@ -7743,7 +7743,7 @@ msgid "Run as administrator (via cmd.exe)"
 msgstr ""
 
 #: src/Template/Agentconnector/config.php:1218
-msgid "sc stop oitcAgentSvc && sc start oitcAgentSvc"
+msgid "sc stop openITCOCKPITAgent && sc start openITCOCKPITAgent"
 msgstr ""
 
 #: src/Template/Agentconnector/config.php:1222

diff --git a/resources/locales/fr_FR/default.po b/resources/locales/fr_FR/default.po
@@ -7744,7 +7744,7 @@ msgid "Run as administrator (via cmd.exe)"
 msgstr ""
 
 #: src/Template/Agentconnector/config.php:1218
-msgid "sc stop oitcAgentSvc && sc start oitcAgentSvc"
+msgid "sc stop openITCOCKPITAgent && sc start openITCOCKPITAgent"
 msgstr ""
 
 #: src/Template/Agentconnector/config.php:1222

diff --git a/resources/locales/ru_RU/default.po b/resources/locales/ru_RU/default.po
@@ -7744,8 +7744,8 @@ msgid "Run as administrator (via cmd.exe)"
 msgstr "Запуск от имени администратора (через cmd.exe)"
 
 #: src/Template/Agentconnector/config.php:1218
-msgid "sc stop oitcAgentSvc && sc start oitcAgentSvc"
-msgstr "sc stop oitcAgentSvc && sc start oitcAgentSvc"
+msgid "sc stop openITCOCKPITAgent && sc start openITCOCKPITAgent"
+msgstr "sc stop openITCOCKPITAgent && sc start openITCOCKPITAgent"
 
 #: src/Template/Agentconnector/config.php:1222
 msgid "sudo systemctl restart openitcockpit-agent.service"

diff --git a/src/Controller/AgentconnectorController.php b/src/Controller/AgentconnectorController.php
@@ -363,10 +363,13 @@ public function updateCheckdata() {
                         //maybe frontend hint, that the agent certificate has changed (and if it should be trusted)
                     }
                 } else {    //does not have a certificate or autossl option was disabled after creation
-                    $receivedChecks = $this->processUpdateCheckdata($this->request->getData('hostuuid'), $this->request->getData('checkdata', '{}', false));
+                    $receivedChecks = $this->processUpdateCheckdata($this->request->getData('hostuuid'), $this->request->getData('checkdata', '{}'), false);
                 }
             } else {
-                $receivedChecks = $this->processUpdateCheckdata($this->request->getData('hostuuid'), $this->request->getData('checkdata', '{}', false));
+                //Agent is not trusted yet - only sache data to cache
+                /** @var AgenthostscacheTable $AgenthostscacheTable */
+                $AgenthostscacheTable = TableRegistry::getTableLocator()->get('Agenthostscache');
+                $AgenthostscacheTable->saveCacheData($this->request->getData('hostuuid'), $this->request->getData('checkdata', '{}'));
             }
         }
 

diff --git a/src/Model/Table/AgentconnectorTable.php b/src/Model/Table/AgentconnectorTable.php
@@ -185,7 +185,6 @@ public function isTrustedFromUser(string $hostuuid) {
      */
     public function isTrustedFromUserAndSaveAgentconnectorIfMissing(array $request) {
         $hostUuid = $request['hostuuid'];
-        $checksum = $request['checksum'];
 
         try {
             $query = $this->find()
@@ -209,7 +208,7 @@ public function isTrustedFromUserAndSaveAgentconnectorIfMissing(array $request)
 
                 $record = $this->newEntity([
                     //'hostuuid'             => $hostUuid,
-                    //'checksum'             => $checksum,
+                    //'checksum'             => $request['checksum'],
                     //'ca_checksum'          => $AgentCertificateData->getCaChecksum(),
                     //'generation_date'      => FrozenTime::now(),
                     //'remote_addr'          => $_SERVER['REMOTE_ADDR'] ?? null,

diff --git a/src/Template/Agentconnector/config.php b/src/Template/Agentconnector/config.php
@@ -1239,7 +1239,7 @@ class="form-control"
 
                                                         <div class="col-12" ng-show="selectedOs === 'windows'">
                                                             <?= __('Run as administrator (via cmd.exe)'); ?>
-                                                            <code><?= __('sc stop oitcAgentSvc && sc start oitcAgentSvc'); ?></code>
+                                                            <code><?= __('sc stop openITCOCKPITAgent && sc start openITCOCKPITAgent'); ?></code>
                                                         </div>
 
                                                         <div class="col-12" ng-show="selectedOs === 'linux'">

diff --git a/src/itnovum/openITCOCKPIT/Core/AngularJS/AngularAssets.php b/src/itnovum/openITCOCKPIT/Core/AngularJS/AngularAssets.php
@@ -66,9 +66,11 @@ class AngularAssets implements AngularAssetsInterface {
         'js/lib/angular-nestable.js',
         'js/lib/parseuri.js',
         'node_modules/moment/min/moment.min.js',
-        'node_modules/vis-data/dist/umd.js',
-        'node_modules/vis-network/dist/vis-network.js',
-        'node_modules/vis-timeline/peer/umd/vis-timeline-graph2d.js',
+        'node_modules/vis-util/peer/umd/vis-util.min.js',
+        'node_modules/vis-data/peer/umd/vis-data.min.js',
+        'node_modules/vis-network/peer/umd/vis-network.min.js',
+        //'node_modules/vis-timeline/peer/umd/vis-timeline-graph2d.min.js',
+        'node_modules/vis-timeline/standalone/umd/vis-timeline-graph2d.min.js',
         'js/scripts/ng.app.js',
         'js/lib/UUID.js-4.0.3/dist/uuid.core.js',
         'node_modules/underscore/underscore-min.js',

diff --git a/webroot/js/scripts/controllers/Agentconnector/AgentconnectorsConfigController.js b/webroot/js/scripts/controllers/Agentconnector/AgentconnectorsConfigController.js
@@ -186,7 +186,7 @@ angular.module('openITCOCKPIT')
                                 break;
 
                             case 'macos':
-                                value = '/Library/openitcockpit-agent/customchecks.cnf';
+                                value = '/Applications/openitcockpit-agent/customchecks.cnf';
                                 break;
 
                             default: