Skip to content

Commit e9f0da2

Browse files
committed
Added Switch "Host is Server" to New host wizard
Host Page switched to english language
1 parent 86495b0 commit e9f0da2

17 files changed

Lines changed: 252 additions & 206 deletions

README.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,24 @@ Gui for generating Icinga configuration files and much more...
99
[![Build Status](https://img.shields.io/travis/Vitexus/icinga_configurator/master.svg?style=flat-square)](https://travis-ci.org/Vitexus/icinga_configurator)
1010
[![Coverage Status](https://img.shields.io/coveralls/Vitexus/icinga_configurator/master.svg?style=flat-square)](https://coveralls.io/r/Vitexus/icinga_configurator?branch=master)
1111

12-
Instalation:
12+
Features
13+
--------
14+
15+
* Generate configuration for multiplete users
16+
* Provide deploy scripts for auto configure NSClient++
17+
* Scannig tcp ports for known services
18+
* Outdated sensors overview
19+
* Recursive import configuration form icinga/nagios config files
20+
* Export configurations to another instance Icinga-editor using HTTP
21+
* Network topology map
22+
* Tool to watch traceroute ping
23+
* Automatic Downtime Schedule for devices every night down (Host is server switch)
24+
* Host icon downloader
25+
26+
Instalation
27+
-----------
1328

14-
(Please run sql server first)
29+
Please make sure you run sql server first
1530

1631
wget -O - http://v.s.cz/info@vitexsoftware.cz.gpg.key|sudo apt-key add -
1732
echo deb http://v.s.cz/ stable main > /etc/apt/sources.list.d/ease.list
@@ -23,7 +38,7 @@ Sorry
2338
=====
2439

2540
* We support only Icinga 1.x configuration yet ...
26-
* Current Default localization is CZECH. (English translation is almost finished.)
41+
* English translation is under progress. But some pages localization is still in CZECH language.
2742

2843
Screenshots
2944
-----------

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vitexsoftware/icinga-editor",
33
"description": "Editor of Icinga Configuration files",
44
"license": "GPL-2.0",
5-
"version": "1.1.2",
5+
"version": "1.2.1",
66
"authors": [
77
{
88
"name": "vitex",

debian/changelog

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
icinga-editor (1.1.2-25) UNRELEASED; urgency=medium
1+
icinga-editor (1.1.2-26) UNRELEASED; urgency=medium
22

33
[ dvorak ]
44
* Initial release. (Closes: #XXXXXX)
@@ -119,5 +119,9 @@ icinga-editor (1.1.2-25) UNRELEASED; urgency=medium
119119
* Fixed Scripts Edit/Upload Switching strings to English
120120
* Fixed Scripts Edit/Upload Switching strings to English
121121
* Support for ShutDown & Up scripts to start/stop icinga
122+
* Deploy script for Windows now use PowerShell Automatic icinga reload
123+
after successfull Configuration files generation Deploying new
124+
script C:\Program Files\NSClient++\refresh.ps1 Main page switched to
125+
English language
122126

123-
-- vitex <vitex@developer.kancl.brevnov.czf> Tue, 16 Aug 2016 19:03:04 +0200
127+
-- vitex <vitex@developer.kancl.brevnov.czf> Wed, 17 Aug 2016 15:03:07 +0200

debian/conf/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vitexsoftware/icinga-editor",
33
"description": "Editor of Icinga Configuration files (debianized)",
4-
"version": "1.1.2.25",
4+
"version": "1.1.2.26",
55
"license": "GPL-2.0",
66
"authors": [
77
{

debian/revison

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
25
1+
26

doc/dashboard.png

-48.8 KB
Loading

src/classes/UI/ContactSelector.php

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
namespace Icinga\Editor\UI;
44

55
/**
6-
* Volba contactů sledovaných danou službou
6+
* Select contacts for service
77
*
88
* @package IcingaEditor
9-
* @subpackage WebUI
109
* @author Vitex <vitex@hippy.cz>
11-
* @copyright 2012 Vitex@hippy.cz (G)
10+
* @copyright 2012-2016 Vitex@hippy.cz (G)
1211
*/
1312
class ContactSelector extends \Ease\Container
1413
{
@@ -24,11 +23,11 @@ public function __construct($holder)
2423
$contactsAssigned = [];
2524
parent::__construct();
2625
$fieldName = $holder->getmyKeyColumn();
27-
$initialContent = new \Ease\TWB\Panel(_('Cíle notifikací'));
26+
$initialContent = new \Ease\TWB\Panel(_('Contacts'));
2827
$initialContent->setTagCss(['width' => '100%']);
2928

3029
if (is_null($holder->getMyKey())) {
31-
$initialContent->addItem(_('Nejprve je potřeba uložit záznam'));
30+
$initialContent->addItem(_('Please saver record first'));
3231
} else {
3332
$serviceName = $holder->getName();
3433
$contact = new \Icinga\Editor\Engine\Contact();
@@ -63,9 +62,9 @@ public function __construct($holder)
6362
$contactInfo[$contact->nameColumn], 'inverse', 'xs',
6463
[
6564
new \Ease\Html\ATag('contacttweak.php?contact_id='.$contactInfo['parent_id'].'&amp;service_id='.$holder->getId(),
66-
\Ease\TWB\Part::GlyphIcon('wrench').' '._('Editace')),
65+
\Ease\TWB\Part::GlyphIcon('wrench').' '._('Edit')),
6766
new \Ease\Html\ATag('?addcontact='.$contactInfo[$contact->nameColumn].'&amp;contact_id='.$contactID.'&amp;'.$holder->getmyKeyColumn().'='.$holder->getMyKey().'&amp;'.$holder->nameColumn.'='.$holder->getName(),
68-
\Ease\TWB\Part::GlyphIcon('plus').' '._('Začít obesílat'))
67+
\Ease\TWB\Part::GlyphIcon('plus').' '._('Start notifing'))
6968
]));
7069
}
7170
}
@@ -80,9 +79,9 @@ public function __construct($holder)
8079
[
8180
new \Ease\Html\ATag(
8281
'?delcontact='.$contactInfo[$contact->nameColumn].'&amp;contact_id='.$contactID.'&amp;'.$holder->getmyKeyColumn().'='.$holder->getMyKey().'&amp;'.$holder->nameColumn.'='.$holder->getName(),
83-
\Ease\TWB\Part::GlyphIcon('remove').' '._('Přestat obesílat'))
82+
\Ease\TWB\Part::GlyphIcon('remove').' '._('Stop notifing'))
8483
, new \Ease\Html\ATag('contacttweak.php?contact_id='.$contactInfo['parent_id'].'&amp;service_id='.$holder->getId(),
85-
\Ease\TWB\Part::GlyphIcon('wrench').' '._('Editace'))
84+
\Ease\TWB\Part::GlyphIcon('wrench').' '._('Edit'))
8685
]
8786
)
8887
);

src/classes/UI/InfoBox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class InfoBox extends \Ease\TWB\Panel
1313
/**
1414
* Infopanel objektu
1515
*
16-
* @param IEcfg $subject
16+
* @param \Icinga\Editor\Engine\Configurator $subject
1717
*/
1818
public function __construct($subject)
1919
{

src/classes/UI/PassiveCheckedHostForm.php

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
namespace Icinga\Editor\UI;
44

55
/**
6-
* Formulář průvodce založením nového hosta
6+
* New Passive Host Wizard Form
77
*
88
* @package IcingaEditor
9-
* @subpackage WebUI
109
* @author Vitex <vitex@hippy.cz>
11-
* @copyright 2015 Vitex@hippy.cz (G)
10+
* @copyright 2015-2016 Vitex@hippy.cz (G)
1211
*/
1312

1413
/**
@@ -24,11 +23,17 @@ function afterAdd()
2423
$this->addItem(new \Ease\TWB\FormGroup(_('Jméno'),
2524
new \Ease\Html\InputTextTag('host_name',
2625
\Ease\Shared::webPage()->getRequestValue('host_name')),
27-
_('hostname'), _('DOMAIN\machine'), _('Název sledovaného stroje')));
28-
$this->addItem(new \Ease\TWB\FormGroup(_('Platforma'),
29-
new PlatformSelector('platform'), null,
30-
_('Platforma sledovaného stroje')));
31-
$this->addItem(new \Ease\TWB\SubmitButton(_('Založit').'&nbsp'.\Ease\TWB\Part::GlyphIcon('forward'),
26+
_('hostname'), _('DOMAIN\machine'), _('Watched host name')));
27+
$this->addItem(new \Ease\TWB\FormGroup(_('Platform'),
28+
new PlatformSelector('platform'), null, _('Watched host platform')));
29+
30+
$this->addInput(new UI\TWBSwitch('host_is_server', $check_method, true,
31+
['handleWidth' => '200px', 'onText' => _('Yes'), 'offText' => _('No')]),
32+
_('Still running'), _('Still running ?'),
33+
_('<strong>Yes</strong> host is still Up. <br><strong>No</strong> device every night down (notebook or PC etc.)'));
34+
35+
36+
$this->addItem(new \Ease\TWB\SubmitButton(_('Create').'&nbsp'.\Ease\TWB\Part::GlyphIcon('forward'),
3237
'success'));
3338
$this->addItem(new \Ease\Html\InputHiddenTag('host_group',
3439
\Ease\Shared::webPage()->getRequestValue('host_group')));

src/classes/UI/StemplateSelect.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class StemplateSelect extends \Ease\Html\Select
1515

1616
function loadItems()
1717
{
18-
$tpls = ['' => _('zvol ze seznamu')];
18+
$tpls = ['' => _('choose ...')];
1919
$stemplate = new \Icinga\Editor\Stemplate();
2020
$templates = $stemplate->getColumnsFromSQL([$stemplate->getmyKeyColumn(),
2121
$stemplate->nameColumn]);

0 commit comments

Comments
 (0)