/ - Diff - GLPI - UNITY 360

Revision 92b19eed

ID	92b19eed752add96e8e62199d81172459a890ebd
Parent	2b77b61b
Child	8d255750

Added by Francois POIROTTE about 7 years ago

Génération de HLS par machine

Crée automatiquement les HLS "services:$host" qui dépend de tous les
services de $host et "machine:$host" qui dépend de l'état de $host
et de ses services.

Pour le moment, les HLS construits ont des dépendances +/- vides car il
manque encore la reconnaissance des tests pour déterminer le nom des
services associés (cf. getNagiosNames() dans VigiloTest).

Change-Id: I558f7d96997c5c520f26daef1157c8de0a790f96
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/2399
Tested-by: Build system <qa@vigilo-dev.si.c-s.fr>
Reviewed-by: Francois POIROTTE <francois.poirotte@c-s.fr>

     	mkdir -p $(DESTDIR)$(DATADIR)/$(NAME)/plugins/
     	mkdir -p $(DESTDIR)$(SYSCONFDIR)/vigilo/vigiconf/conf.d/groups/managed
     	mkdir -p $(DESTDIR)$(SYSCONFDIR)/vigilo/vigiconf/conf.d/hosts/managed
     	mkdir -p $(DESTDIR)$(SYSCONFDIR)/vigilo/vigiconf/conf.d/hlservices/managed
     	cp -pr src/plugins/vigilo $(DESTDIR)$(DATADIR)/$(NAME)/plugins/
     install_data: pkg/init pkg/sudoers
-...
     	chown root:root $(DESTDIR)$(SYSCONFDIR)/sudoers.d/$(PKGNAME)
     	chown vigiconf:apache $(DESTDIR)$(SYSCONFDIR)/vigilo/vigiconf/conf.d/groups/managed
     	chown vigiconf:apache $(DESTDIR)$(SYSCONFDIR)/vigilo/vigiconf/conf.d/hosts/managed
     	chown vigiconf:apache $(DESTDIR)$(SYSCONFDIR)/vigilo/vigiconf/conf.d/hlservices/managed
     	chmod 0770 $(DESTDIR)$(SYSCONFDIR)/vigilo/vigiconf/conf.d/groups/managed
     	chown 0770 $(DESTDIR)$(SYSCONFDIR)/vigilo/vigiconf/conf.d/hosts/managed
     	chown 0770 $(DESTDIR)$(SYSCONFDIR)/vigilo/vigiconf/conf.d/hlservices/managed
     clean: clean_common

pkg/glpi.redhat.spec
55	55	%defattr(644,vigiconf,apache,770)
56	56	%dir %{vigiconf_confdir}/groups/managed/
57	57	%dir %{vigiconf_confdir}/hosts/managed/
	58	%dir %{vigiconf_confdir}/hlservices/managed/
58	59	%attr(755,root,root) %{_initrddir}/%{name}
59	60
60	61	%changelog

     <?php
     class VigiloDepends extends VigiloXml
+    {
         protected $host;
         protected $service;
         public function __construct($host = null, $service = null)
+        {
             if (null === $host && null === $service) {
                 throw new Exception('Invalid dependency');
+            }
             if ('' === $host || '' === $service || !is_string($host) || !is_string($service)) {
                 throw new Exception('Invalid dependency');
+            }
             $this->host     = $host;
             $this->service  = $service;
+        }
         public function __toString()
+        {
             if (null === $this->host) {
                 return "<depends service=\"{$this->service}\"/>";
+            }
             if (null === $this->service) {
                 return "<depends host=\"{$this->host}\"/>";
+            }
             return "<depends host=\"{$this->host}\" service=\"{$this->service}\"/>";
+        }
+    }

     <?php
     class VigiloHlservice extends VigiloXml implements ArrayAccess
+    {
         protected $name;
         protected $message;
         protected $priorities;
         protected $dependencies;
         const OPERATOR_AND  = "and";
         const OPERATOR_OR   = "or";
         const OPERATOR_PLUS = "plus";
         const STATE_WARNING     = 1;
         const STATE_CRITICAL    = 2;
         const STATE_UNKNOWN     = 3;
         public function __construct($name, $operator, $message, $warnThreshold = 0, $critThreshold = 0)
+        {
             if (!in_array($operator, array(self::OP_AND, self::OP_OR, self::OP_PLUS))) {
                 throw new Exception('Invalid operator');
+            }
             $this->name             = $name;
             $this->message          = $message;
             $this->operator         = $operator;
             $this->warnThreshold    = (int) $warnThreshold;
             $this->critThreshold    = (int) $critThreshold;
             $this->priorities       = array();
             $this->dependencies     = array();
+        }
         public function getName()
+        {
             return $this->name;
+        }
         public function setPriority($state, $priority)
+        {
             if (!in_array($priority, array(self::STATE_WARNING, self::STATE_CRITICAL, self::STATE_UNKNOWN))) {
                 throw new Exception('Invalid state');
+            }
             $this->priorities[$state] = (int) $priority;
+        }
         public function setWarningThreshold($threshold)
+        {
             $this->warnThreshold = (int) $threshold;
+        }
         public function setCriticalThreshold($threshold)
+        {
             $this->critThreshold = (int) $threshold;
+        }
         public function offsetExists($offset)
+        {
             return isset($this->dependencies[$offset]);
+        }
         public function offsetGet($offset)
+        {
             return isset($this->dependencies[$offset]) ? $this->dependencies[$offset] : null;
+        }
         public function offsetSet($offset, $value)
+        {
             if (!is_object($value) || !($value instanceof VigiloDepends)) {
                 throw new \RuntimeException("Invalid dependency");
+            }
             $this->dependencies[$offset] = $value;
+        }
         public function offsetUnset($offset)
+        {
             unset($this->dependencies[$offset]);
+        }
         public function __toString()
+        {
             $priorities = array();
             $map        = array(
                 "unknown"   => self::STATE_UNKNOWN,
                 "warning"   => self::STATE_WARNING,
                 "critical"  => self::STATE_CRITICAL,
             );
             foreach ($map as $name => $id) {
                 if (isset($this->priorities[$id])) {
                     $value          = $this->priorities[$id];
                     $priorities[]   = "<${name}_priority>$value</${name}_priority>";
+                }
+            }
             $xml = <<<HLS
     <hlservice>
         <message>%s</message>
         <warning_threshold>%d</warning_threshold>
         <critical_threshold>%d</critical_threshold>
         %s
         <operator>%s</operator>
         %s
     </hlservice>
     HLS;
             return self::sprintf(
                 $xml,
                 $this->message,
                 $this->warnThreshold,
                 $this->critThreshold,
                 $priorities,
                 $this->operator,
                 $this->dependencies
             );
+        }
+    }

src/plugins/vigilo/Vigilo/VigiloTest.php
15	15	}
16	16	}
17	17
	18	public function getNagiosNames()
	19	{
	20	$res = array();
	21
	22	return $res;
	23	}
	24
18	25	public function offsetExists($offset)
19	26	{
20	27	$name = is_a($offset, 'VigiloArg') ? $offset->getName() : $offset;

             return $this->item->getName();
+        }
         protected function filterTests($value)
+        {
             return is_object($value) && ($value instanceof VigiloTest);
+        }
         public function getTests()
+        {
             return new CallbackFilterIterator(
                 new ArrayIterator($this->children),
                 array($this, 'filterTests')
             );
+        }
         protected function selectTemplates()
+        {
             $template = $this->item->fields['vigilo_template'];
-...
         public function __toString()
+        {
             $outXML = new DOMDocument();
             $outXML->preserveWhiteSpace = false;
             $outXML->formatOutput       = true;
             $outXML->loadXML(
                 self::sprintf(
                     '<?xml version="1.0"?>' .
                     '<host name="%s" address="%s" ventilation="%s">%s</host>',
                     $this->item->getName(),
                     $this->selectAddress(),
                     "Servers",
                     $this->children
+                )
             return self::sprintf(
                 '<?xml version="1.0"?>' .
                 '<host name="%s" address="%s" ventilation="%s">%s</host>',
                 $this->item->getName(),
                 $this->selectAddress(),
                 "Servers",
                 $this->children
             );
             return $outXML->saveXML();
+        }
+    }

     <?php
     class PluginVigiloAbstractMonitoredItem extends VigiloXml
+    {
         protected $name;
         protected $hlsHost;
         protected $hlsServices;
         const MESSAGE = "%(state)s: %(active_deps)r/%(total_deps)r active deps";
         public function __construct(PluginVigiloAbstractMonitoredItem $host)
+        {
             $name = $host->getName();
             // Création d'un HLS qui dépend de tous les services de l'hôte.
             $this->hlsServices  = new VigiloHlservice(
                 "services:$name",
                 VigiloHlservice::OPERATOR_AND,
                 self::MESSAGE
             );
             $nbServices = 0;
             foreach ($host->getTests() as $test) {
                 foreach ($test->getNagiosNames() as $service) {
                     $this->hlsServices[] = new VigiloDepends($name, $service);
                     $nbServices++;
+                }
+            }
             // Création d'un HLS qui dépend de l'hôte et du HLS précédent.
             $this->hlsHost      = new VigiloHlservice(
                 "machine:$name",
                 VigiloHlservice::OPERATOR_AND,
                 self::MESSAGE
             );
             $this->hlsHost[]    = new VigiloDepends($host);
             $this->hlsHost[]    = new VigiloDepends(null, "services:$name");
             $this->name         = $name;
+        }
         public function getName()
+        {
             return $this->name;
+        }
         public function __toString()
+        {
             return "<?xml version="1.0"?><hlservices>{$this->hlsHost}{$this->hlsServices}</hlservices>";
+        }
+    }

                 mkdir($confdir, 0770, true);
+            }
             $res = file_put_contents($file, $obj, LOCK_EX);
             $outXML = new DOMDocument();
             $outXML->preserveWhiteSpace = false;
             $outXML->formatOutput       = true;
             $outXML->loadXML((string) $obj);
             $res = file_put_contents($file, $outXML->saveXML(), LOCK_EX);
             if (false !== $res) {
                 @chgrp($file, "vigiconf");
                 @chmod($file, 0660);
-...
             $cls = "PluginVigiloMonitored" . $item->getType();
             if (class_exists($cls, true)) {
                 $obj = new $cls($item);
                 // Ecriture du fichier de configuration principal (host).
                 $this->writeVigiloConfig($obj, "hosts");
                 // Création d'un service de haut niveau "services:<nom>"
                 // qui affichera le pire état des services de la machine "<nom>",
                 // et d'un service "machine:<nom>" qui affichera le pire état
                 // entre l'état de la machine "<nom>" et de ses services.
                 $hls = new PluginVigiloHls($obj);
                 $this->writeVigiloConfig($hls, "hlservices");
+            }
+        }

Also available in: Unified diff

Project

General

Profile

Revision 92b19eed