[omd-commits] OMD Git: omd: shinken: one last patch so that object criticity is shown in thruk

git version control git at mathias-kettner.de
Fri May 20 16:57:04 CEST 2011


Module:   omd
Branch:   master
Commit:   94b6acf7ddb899055bfa99b3c1872c220df13b01
URL:      http://omdistro.org/projects/omd/repository/revisions/94b6acf7ddb899055bfa99b3c1872c220df13b01

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Fri May 20 16:53:33 2011 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Fri May 20 16:53:33 2011 +0200

shinken: one last patch so that object criticity is shown in thruk

---

 packages/shinken/Makefile                          |    8 ++--
 ...e-criticity-from-retention-data-it-was-st.patch |   39 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile
index 5922f13..1cc53ef 100644
--- a/packages/shinken/Makefile
+++ b/packages/shinken/Makefile
@@ -51,10 +51,10 @@ export PYTHONPATH
 build:
 	test -f ${SHINKEN_FILE} || wget $(SHINKEN_URL)
 	tar xzf $(SHINKEN_FILE)
-	#set -e ; for p in patches/*.patch ; do \
-	#    echo "applying $$p..." ; \
-	#    ( cd $(SHINKEN) ; patch -p1 -b ) < $$p ; \
-	#done
+	set -e ; for p in patches/*.patch ; do \
+	    echo "applying $$p..." ; \
+	    ( cd $(SHINKEN) ; patch -p1 -b ) < $$p ; \
+	done
 	test -f $(PYRO_FILE) || wget $(PYRO_URL)
 	tar xzf $(PYRO_FILE)
 	test -f $(MP_FILE) || wget $(MP_URL)
diff --git a/packages/shinken/patches/1789-Fix-remove-criticity-from-retention-data-it-was-st.patch b/packages/shinken/patches/1789-Fix-remove-criticity-from-retention-data-it-was-st.patch
new file mode 100644
index 0000000..92b7e79
--- /dev/null
+++ b/packages/shinken/patches/1789-Fix-remove-criticity-from-retention-data-it-was-st.patch
@@ -0,0 +1,39 @@
+From f80d7acf832dc4471ffc0cad09ad515d114da542 Mon Sep 17 00:00:00 2001
+From: naparuba <naparuba at users.sourceforge.net>
+Date: Fri, 20 May 2011 16:20:37 +0200
+Subject: [PATCH] Fix: remove criticity from retention data, it was stupid to put it in it.
+
+---
+ shinken/objects/host.py    |    2 +-
+ shinken/objects/service.py |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/shinken/objects/host.py b/shinken/objects/host.py
+index c135854..86bb7c9 100644
+--- a/shinken/objects/host.py
++++ b/shinken/objects/host.py
+@@ -123,7 +123,7 @@ class Host(SchedulingItem):
+         'maintenance_period':   StringProp(default='', fill_brok=['full_status']),
+ 
+         # Criticity value
+-        'criticity':            IntegerProp(default='2', fill_brok=['full_status'], retention=True),
++        'criticity':            IntegerProp(default='2', fill_brok=['full_status']),
+     })
+ 
+     # properties set only for running purpose
+diff --git a/shinken/objects/service.py b/shinken/objects/service.py
+index e86e14b..0b83667 100644
+--- a/shinken/objects/service.py
++++ b/shinken/objects/service.py
+@@ -121,7 +121,7 @@ class Service(SchedulingItem):
+         'default_value':           StringProp(default=''),
+ 
+         # Criticity value
+-        'criticity':               IntegerProp(default='2', fill_brok=['full_status'], retention=True),
++        'criticity':               IntegerProp(default='2', fill_brok=['full_status']),
+     })
+ 
+     # properties used in the running state
+-- 
+1.5.5.6
+



More information about the omd-commits mailing list