Merge branch 'update-appmonitor' into 'master'

Update appmonitor

See merge request !91

public_html/appmonitor/index.php

@@ -86,8 +86,14 @@ $iProjectCount=count($oPrj->getProjects());
 $iInProgress=0;
 $iInQueue=0;
 foreach ($oPrj->getProjects() as $sPrj) {
-        $oPrj->getPhases();
+        $oPrj2=new project($sPrj);
+        $aProgress=$oPrj2->getProgress();
+        /*
+         * so ist irgendwas anders ... er initialisiert das Projekt nicht
+         * 
+        $oPrj->setProjectById($sPrj);
         $aProgress=$oPrj->getProgress();
+         */
         $iInProgress+=$aProgress['inprogress'] ? 1 : 0;
         $iInQueue+=$aProgress['hasQueue'] ? 1 : 0;
 }
@@ -187,10 +193,12 @@ if(count($aConfig['mirrorPackages'])){
         (
             [type] => rsync
             [runas] => 
-            [target] => copy-deployment@puppet.one.iml.unibe.ch:/var/shared/imldeployment
+            [target] => copy-deployment@puppet:/var/shared/imldeployment
         )
          */
-        $sCmd='ssh '.$aData['target']. ' ls -1';
+        $sTargetHost = preg_replace('/\:.*/', '', $aData['target']);
+        $sCmd='ssh '.$sTargetHost. ' ls -1';
+
         exec($sCmd, $sOut, $iRc);
         $oMonitor->addCheck(
             array(
@@ -200,7 +208,7 @@ if(count($aConfig['mirrorPackages'])){
                     "function" => "Simple",
                     "params" => array(
                         "result" => $iRc ? RESULT_ERROR : RESULT_OK,
-                        "value" => "$sCmd returns $sOut",
+                        "value" => "Command [$sCmd] returns with exitcode $iRc; output: ".implode(" ", $sOut),
                     ),
                 ),
             )