From 7c7fe74dab50e5ee722ad0ca434398cee505dd4a Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Singh Date: Mon, 20 Jun 2016 18:06:58 +0530 Subject: [PATCH 1/3] Update admin.rst with monitoring tool shinken. --- docs/scenarios/admin.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/scenarios/admin.rst b/docs/scenarios/admin.rst index f0b56a695..55926fd14 100644 --- a/docs/scenarios/admin.rst +++ b/docs/scenarios/admin.rst @@ -380,3 +380,13 @@ environment can be created, and many are already available. Buidout is written in Python. +Shinken +------- + +`Shinken `_ is a modern, Nagios compatible monitoring framework, written in Python. +Its main goal is to give users a flexible architecture for their monitoring +system that is designed to scale to large environments. + +Shinken is backwards-compatible with the Nagios configuration standard and plugins. +It works on any operating system and architecture that supports Python, which includes +Windows, GNU/Linux and FreeBSD. From 30f19999fd5823f85bd6f535504188b49c9d4baf Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Singh Date: Tue, 21 Jun 2016 12:54:55 +0530 Subject: [PATCH 2/3] Corrected Oxford comma. Close #238 Signed-off-by: Abhishek Kumar Singh --- docs/scenarios/admin.rst | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/scenarios/admin.rst b/docs/scenarios/admin.rst index 55926fd14..69e66d491 100644 --- a/docs/scenarios/admin.rst +++ b/docs/scenarios/admin.rst @@ -383,10 +383,11 @@ Buidout is written in Python. Shinken ------- -`Shinken `_ is a modern, Nagios compatible monitoring framework, written in Python. -Its main goal is to give users a flexible architecture for their monitoring -system that is designed to scale to large environments. - -Shinken is backwards-compatible with the Nagios configuration standard and plugins. -It works on any operating system and architecture that supports Python, which includes -Windows, GNU/Linux and FreeBSD. +`Shinken `_ is a modern, Nagios compatible +monitoring framework written in Python.Its main goal is to give users a flexible +architecture for their monitoring system that is designed to scale to large +environments. + +Shinken is backwards-compatible with the Nagios configuration standard and +plugins.It works on any operating system and architecture that supports Python +which includes Windows, GNU/Linux and FreeBSD. From a64d47166c198f3161b8c3d25121e97da4d59cfa Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Singh Date: Tue, 21 Jun 2016 13:00:42 +0530 Subject: [PATCH 3/3] Added Oxford Comma! Signed-off-by: Abhishek Kumar Singh --- docs/scenarios/admin.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/scenarios/admin.rst b/docs/scenarios/admin.rst index 69e66d491..7fbc9b51b 100644 --- a/docs/scenarios/admin.rst +++ b/docs/scenarios/admin.rst @@ -384,10 +384,10 @@ Shinken ------- `Shinken `_ is a modern, Nagios compatible -monitoring framework written in Python.Its main goal is to give users a flexible +monitoring framework written in Python. Its main goal is to give users a flexible architecture for their monitoring system that is designed to scale to large environments. -Shinken is backwards-compatible with the Nagios configuration standard and -plugins.It works on any operating system and architecture that supports Python -which includes Windows, GNU/Linux and FreeBSD. +Shinken is backwards-compatible with the Nagios configuration standard, and +plugins.It works on any operating system, and architecture that supports Python +which includes Windows, GNU/Linux, and FreeBSD.