|
[-]
[+]
|
Changed |
icinga-web.changes
|
|
|
|
[-]
[+]
|
Changed |
icinga-web.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
icinga-web-1.5.0.tar.bz2/app/modules/Reporting/config/module.xml
^
|
| @@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ae:configurations xmlns="http://agavi.org/agavi/config/parts/module/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
-
- <ae:configuration>
-
- <module enabled="true">
- <settings>
- <!-- META -->
- <setting name="title">Reporting Module</setting>
- <setting name="version">1.0</setting>
-
- <setting name="authors">
- <ae:parameter name="info@icinga.org">Icinga Development Team</ae:parameter>
- </setting>
-
- <setting name="homepage">http://www.icinga.org</setting>
- <setting name="update_url" />
- <setting name="description">Seamless integration of jasper reporting into icinga-web</setting>
-
- <!-- Reporting Javascript libs -->
- <setting name="agavi.include.javascript">
- <ae:parameter>%core.module_dir%/Reporting/config/javascript.xml</ae:parameter>
- </setting>
-
- <!-- Reporting cronks -->
- <setting name="agavi.include.cronks">
- <ae:parameter>%core.module_dir%/Reporting/config/cronks.xml</ae:parameter>
- </setting>
-
- <!-- Module routing table -->
- <setting name="agavi.include.routing">
- <ae:parameter>%core.module_dir%/Reporting/config/routing.xml</ae:parameter>
- </setting>
-
- <!-- Temp report generation dir -->
- <setting name="dir.download">%core.module_dir%/Reporting/data/tmp</setting>
-
- <!-- Previewable mime types -->
- <setting name="preview.mime_regex"><![CDATA[/^(image|text)\/.+|application\/xml|application\/pdf.+/i]]></setting>
-
- <!-- Previewable ws types (Jasper short form) -->
- <setting name="preview.jasper_resources">
- <ae:parameter>com.jaspersoft.jasperserver.api.metadata.common.domain.FileResource</ae:parameter>
- <ae:parameter>com.jaspersoft.jasperserver.api.metadata.common.domain.ContentResource</ae:parameter>
- </setting>
-
- <!-- Resource type icon classes -->
- <setting name="icon.wsType.mapping">
- <ae:parameter name="reportUnit">icinga-icon-report</ae:parameter>
- <ae:parameter name="bean">icinga-icon-bean</ae:parameter>
- <ae:parameter name="contentResource">icinga-icon-report-run</ae:parameter>
- <ae:parameter name="datasource">icinga-icon-database</ae:parameter>
- <ae:parameter name="dataType">icinga-icon-cog</ae:parameter>
- <ae:parameter name="folder"></ae:parameter>
- <ae:parameter name="font">icinga-icon-document</ae:parameter>
- <ae:parameter name="img">icinga-icon-image</ae:parameter>
- <ae:parameter name="inputControl">icinga-icon-ui-text-field</ae:parameter>
- <ae:parameter name="jar">icinga-icon-jar</ae:parameter>
- <ae:parameter name="jdbc">icinga-icon-databases-relation</ae:parameter>
- <ae:parameter name="jndi">icinga-icon-folder-network</ae:parameter>
- </setting>
-
- <!-- Parameter and datatype mapping -->
- <setting name="parameter.mapping.name">
- <ae:parameter name="p_host_object_id">
- <ae:parameter name="className">Icinga.Reporting.inputControl.ApiSelectionField</ae:parameter>
- <ae:parameter name="target">host</ae:parameter>
- <ae:parameter name="valueField">HOST_OBJECT_ID</ae:parameter>
- <ae:parameter name="displayField">HOST_NAME</ae:parameter>
- </ae:parameter>
- <ae:parameter name="p_hostgroup_object_id">
- <ae:parameter name="className">Icinga.Reporting.inputControl.ApiSelectionField</ae:parameter>
- <ae:parameter name="target">hostgroup</ae:parameter>
- <ae:parameter name="valueField">HOSTGROUP_OBJECT_ID</ae:parameter>
- <ae:parameter name="displayField">HOSTGROUP_NAME</ae:parameter>
- </ae:parameter>
-
- <ae:parameter name="p_service_object_id">
- <ae:parameter name="className">Icinga.Reporting.inputControl.ApiSelectionField</ae:parameter>
- <ae:parameter name="target">service</ae:parameter>
- <ae:parameter name="valueField">SERVICE_OBJECT_ID</ae:parameter>
- <ae:parameter name="displayField">SERVICE_NAME</ae:parameter>
- </ae:parameter>
- </setting>
-
- <setting name="parameter.mapping.type">
- <ae:parameter name="2">
- <ae:parameter name="className">Ext.form.DateField</ae:parameter>
- <ae:parameter name="format">Y-m-d H:i:s</ae:parameter>
- <!-- H:i:s -->
- </ae:parameter>
- </setting>
-
- <!--
- Jasperserver configuration:
- Use the setting names to configure your cronk, in the following case:
-
- - modules.reporting.jasperconfig.default
- - modules.reporting.jasperconfig.custom1
- -->
-
- <!-- Jasper configurations -->
- <setting name="jasperconfig.default">
- <ae:parameter name="jasper_url">http://10.121.0.95:8080/jasperserver</ae:parameter>
- <ae:parameter name="jasper_user">jasperadmin</ae:parameter>
- <ae:parameter name="jasper_pass">jasperadmin</ae:parameter>
- <ae:parameter name="tree_root">/Icinga/reports</ae:parameter>
- </setting>
-
- <!-- Custom config if I have more that once -->
- <!--
- <setting name="jasperconfig.custom1">
- <ae:parameter name="jasper_url">http://127.0.0.175/jasperserver</ae:parameter>
- <ae:parameter name="jasper_user">custom_user</ae:parameter>
- <ae:parameter name="jasper_pass">custom_passwd</ae:parameter>
- </setting>
- -->
-
- </settings>
- </module>
-
- </ae:configuration>
-
-</ae:configurations>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/Makefile.in
^
|
| @@ -127,6 +127,7 @@
app/modules/AppKit/config/module.xml \
app/modules/AppKit/config/auth.xml \
app/modules/Cronks/config/module.xml \
+ app/modules/Reporting/config/module.xml \
etc/build.properties \
tests/phpunit/test.properties \
etc/apache2/icinga-web.conf \
@@ -164,7 +165,7 @@
--standard=$(SRC_DIR)/tests/phpcs/YACS \
--report=checkstyle \
--report-file=$(SRC_DIR)/.build/checkstyle.xml \
- --ignore=cache \
+ --ignore="cache,\.js$$" \
$(SRC_DIR)/app
devel-inplace-config:
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/Makefile.in
^
|
| @@ -5,7 +5,7 @@
BINDIR=@bindir@
CGIDIR=@sbindir@
HTMLDIR=@datarootdir@
-
+LOGFOLDER=@web_log_folder@
INSTALL=@INSTALL@
INSTALL_OPTS=@INSTALL_OPTS@
INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
@@ -32,6 +32,6 @@
$(INSTALL) -m 755 $(INSTALL_OPTS_CACHE) -d $(DESTDIR)$(prefix)/app/cache
$(INSTALL) -m 755 $(INSTALL_OPTS_CACHE) -d $(DESTDIR)$(prefix)/app/cache/config
- $(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/app/data/log
+ $(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(LOGFOLDER)
$(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/app/data/tmp
$(INSTALL) -m 755 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/app/modules/Reporting/data
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/config/databases.xml.in
^
|
| @@ -56,13 +56,15 @@
</database>
- <database xmlns="http://agavi.org/agavi/config/parts/databases/1.0" name="icinga" class="AppKitDoctrineDatabase">
+ <database xmlns="http://agavi.org/agavi/config/parts/databases/1.0" name="icinga" class="IcingaDoctrineDatabase">
<ae:parameter name="dsn">@api_subtype@://@api_db_user@:@api_db_pass@@@api_host@:@api_port@/@api_db_name@</ae:parameter>
<ae:parameter name="prefix">@api_db_prefix@</ae:parameter>
<ae:parameter name="charset">utf8</ae:parameter>
<ae:parameter name="manager_attributes">
<ae:parameter name="Doctrine_Core::ATTR_MODEL_LOADING">CONSERVATIVE</ae:parameter>
</ae:parameter>
+ <ae:parameter name="use_retained">true</ae:parameter>
+
<ae:parameter name="load_models">%core.module_dir%/Api/lib/database/models/generated</ae:parameter>
<ae:parameter name="models_directory">%core.module_dir%/Api/lib/database/models</ae:parameter>
<ae:parameter name="caching">
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/config/translation.xml.in
^
|
| @@ -1,6 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<ae:configurations xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0" xmlns="http://agavi.org/agavi/config/parts/translation/1.0">
<ae:configuration>
+ <!--
+ You should always prefer your php.ini timezone!
+ If this isn't possible, change the available locales config
+ to set your timezone like this:
+ -->
+ <!--
+ <available_locales default_locale="en" default_timezone="GMT">
+ -->
<available_locales default_locale="en" >
<!-- German, Germany -->
<available_locale identifier="de_DE">
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Api/config/autoload.xml
^
|
| @@ -8,6 +8,7 @@
<autoload name="AccessConfig">%core.module_dir%/Api/lib/config/AccessConfig.class.php</autoload>
<autoload name="AccessConfigHandler">%core.module_dir%/Api/lib/config/AccessConfigHandler.class.php</autoload>
+ <autoload name="IcingaDoctrineDatabase">%core.module_dir%/Api/lib/database/IcingaDoctrineDatabase.class.php</autoload>
<autoload name="IcingaDoctrine_Query">%core.module_dir%/Api/lib/database/IcingaDoctrine_Query.class.php</autoload>
<autoload name="Icinga_Doctrine_Table">%core.module_dir%/Api/lib/database/IcingaDoctrineTable.class.php</autoload>
|
|
[-]
[+]
|
Added |
icinga-web-1.5.1.tar.bz2/app/modules/Api/lib/database/IcingaDoctrineDatabase.class.php
^
|
| @@ -0,0 +1,18 @@
+<?php
+
+class IcingaDoctrineDatabase extends AppKitDoctrineDatabase {
+ private $use_retained = false;
+ public function initialize(AgaviDatabaseManager $databaseManager, array $parameters = array()) {
+ parent::initialize($databaseManager, $parameters);
+
+ if ($this->getParameter('use_retained')) {
+ $this->use_retained = true;
+ }
+ }
+
+ public function useRetained() {
+ return $this->use_retained;
+ }
+}
+
+?>
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Api/models/Commands/CommandDispatcherModel.class.php
^
|
| @@ -40,8 +40,13 @@
try {
$this->consoleContext->exec($cmd);
+ if($cmd->getReturnCode() != '0')
+ throw new Exception("Could not send command. Check if your webserver's user has correct permissions for writing to the command pipe.");
} catch (Exception $e) {
+
$this->context->getLoggerManager()->log("Sending command failed ".$e->getMessage() );
+ throw $e;
+
}
}
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Api/models/DBALMetaManagerModel.class.php
^
|
| @@ -26,7 +26,7 @@
'IcingaFlappinghistory',
'IcingaHostContactgroups',
'IcingaHostContacts',
- 'IcingaParenthosts',
+ 'IcingaHostParenthosts',
'IcingaHostchecks',
'IcingaHostdependencies',
'IcingaHostescalationContactgroups',
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Api/models/Store/LegacyLayer/IcingaApiModel.class.php
^
|
| @@ -124,12 +124,13 @@
$fields = $this->getFields();
$_data = array(array());
foreach($fields as $field) {
+ $field = preg_replace("/\w* +AS +/","",$field);
$countField = explode(".",$field,2);
if (count($countField) > 1) {
$countField = $countField[1];
}
-
+
$_data[0]["COUNT_".strtoupper($countField)] = $data;
$resultCols[] = "COUNT_".strtoupper($countField);
}
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
^
|
| @@ -10,7 +10,7 @@
}
protected $ignoreIds = false;
-
+ protected $retainedAlias = false;
public $columns = array(
'PROBLEMS_OBJECT_ID' => 'op.object_id',
// Program information
@@ -339,7 +339,7 @@
**/
protected function setupApiTargetFor($target) {
$this->reset();
-
+ $this->retainedAlias = false;
switch ($target) {
case IcingaApiConstants::TARGET_INSTANCE:
$this->mainAlias = "i";
@@ -349,7 +349,7 @@
case IcingaApiConstants::TARGET_HOST:
$this->mainAlias = "oh";
$this->setTarget("IcingaObjects");
-
+ $this->retainedAlias = "h";
$this->aliasDefs = array(
"h" => array("src" => "oh", "relation" => "host", "alwaysJoin" => true),
"hs" => array("src" => "h", "relation" => "status","alwaysJoin" => true),
@@ -371,7 +371,7 @@
case IcingaApiConstants::TARGET_SERVICE:
$this->mainAlias = "os";
$this->setTarget("IcingaObjects");
-
+ $this->retainedAlias = "s";
$this->aliasDefs = array(
"s" => array("src" => "os", "relation" => "service", "alwaysJoin" => true),
"i" => array("src" => "s", "relation" => "instance"),
@@ -412,7 +412,7 @@
case IcingaApiConstants::TARGET_HOSTGROUP:
$this->mainAlias = "hg";
$this->setTarget("IcingaHostgroups");
-
+
$this->aliasDefs = array(
"ohg" => array("src" => "hg", "relation" => "object"),
"hgm" => array("src" => "hg", "relation" => "members"),
@@ -492,8 +492,10 @@
$this->additionalSelects["COUNT"] = "count(DISTINCT hs.host_object_id)";
$this->ignoreIds = true;
$this->forceGroup[] = "hs.current_state";
+ $this->retainedAlias = "h";
$this->aliasDefs = array(
- "h" => array("src" => "oh", "relation" => "host"),
+ "h" => array("src" => "oh", "relation" => "host","alwaysJoin"=>true),
+ "s" => array("src" => "h", "relation" => "services"),
"oh" => array("src" => "hs", "relation" => "hostobject", "alwaysJoin" => true),
"i" => array("src" => "h", "relation" => "instance"),
"cg" => array("src" => "h", "relation" => "contactgroups"),
@@ -514,7 +516,7 @@
$this->setTarget("IcingaServicestatus");
$this->additionalSelects["SERVICE_STATE"] = "ss.current_state";
$this->additionalSelects["COUNT"] = "count(DISTINCT ss.service_object_id)";
-
+ $this->retainedAlias = "s";
$this->forceGroup[] = "ss.current_state";
$this->aliasDefs = array(
"s" => array("src" => "os", "relation" => "service", "alwaysJoin" => true),
@@ -668,6 +670,7 @@
"with" => "ohg.is_active = 1"
),
"hgm" => array("src" => "hg", "relation" => "members"),
+ "s" => array("src" => "hgm", "relation" => "services"),
"hs" => array("src" => "hgm", "relation" => "status"),
"oh" => array("src" => "hgm", "relation" => "object")
);
@@ -709,6 +712,8 @@
case IcingaApiConstants::TARGET_HOST_SERVICE:
$this->mainAlias = "op";
$this->setTarget("IcingaObjects");
+ $this->retainedAlias = "h";
+
$this->aliasDefs = array(
"os" => array(
@@ -890,7 +895,23 @@
$o->addSelect($select.(is_numeric($alias) ? "" : " AS ".$alias));
}
-
+ $db = $this->getContext()->getDatabaseManager()->getDatabase('icinga');
+ // check if retained state must be respected
+ if(method_exists($db,"useRetained")) {
+ /*
+ * the core with idomod dumps 2 different config types
+ * idomod.cfg:config_output_options
+ * 1 = original config => config_type = 0
+ * 2 = retained config => config_type = 1
+ * 3 = both, both config_types are available
+ */
+ if($this->retainedAlias) {
+ $o->andWhere($this->retainedAlias.".config_type= ?",$db->useRetained() ? "1" : "0");
+
+ }
+
+
+ }
foreach($this->forceGroup as $group) {
$o->addGroupBy($group);
}
|
|
[-]
[+]
|
Added |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/actions/ServertimeAction.class.php
^
|
| @@ -0,0 +1,16 @@
+<?php
+
+class AppKit_ServertimeAction extends AppKitBaseAction
+{
+
+ public function getDefaultViewName()
+ {
+ return 'Success';
+ }
+
+ public function isSimple() {
+ return true;
+ }
+}
+
+?>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/cache/Servertime.xml
^
|
| @@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ae:configurations xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0" xmlns="http://agavi.org/agavi/config/parts/caching/1.0">
+
+ <ae:configuration>
+
+ <caching enabled="false">
+ </caching>
+
+ </ae:configuration>
+
+</ae:configurations>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/config/javascript.xml
^
|
| @@ -11,6 +11,8 @@
<ae:parameter>%core.module_dir%/AppKit/lib/js/AppKit.js</ae:parameter>
<ae:parameter>%core.module_dir%/AppKit/lib/js/AppKitUtil.js</ae:parameter>
<ae:parameter>%core.module_dir%/AppKit/lib/js/utils/stacktrace.js</ae:parameter>
+ <ae:parameter>%core.module_dir%/AppKit/lib/js/utils/AppKitServertime.js</ae:parameter>
+
<ae:parameter>%core.module_dir%/AppKit/lib/js/AppKitErrorHandler.js</ae:parameter>
<ae:parameter>%core.module_dir%/AppKit/lib/js/Layout.js</ae:parameter>
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/config/routing.xml
^
|
| @@ -6,7 +6,7 @@
<!-- * AppKit routes -->
<route name=".appkit" pattern="^/appkit" module="%actions.default_module%">
- <!-- check if the webserver is dead -->
+ <route name="servertime" pattern="^/servertime" action="Servertime" output_type="simple"/>
<route name="ping" pattern="^/ping" action="Ping" />
<route name=".dispatcher" pattern="^/dispatch" action="Dispatcher" output_type="json" />
<route name=".login" pattern="^/login" action="%actions.login_action%">
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/lib/config/AppKitResourceConfigHandler.class.php
^
|
| @@ -75,10 +75,10 @@
// Collecting resources
foreach($this->_resources as $resource => $sfx) {
- $resources[$resource] = array_merge(
+ $resources[$resource] = array_unique(array_merge(
$resources[$resource],
$this->collectResource($resource, $sfx, $cfg)
- );
+ ));
}
// Collecting javascript actions
foreach($cfg->getChildren('jactions', null, true) as $jaction) {
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/lib/context/AppKitAgaviContext.class.php
^
|
| @@ -56,7 +56,7 @@
foreach($list as $mod_name) {
try {
- if($mod_name != 'AppKit')
+ if($mod_name != 'AppKit' && $mod_name != 'TestDummy')
AppKitAgaviUtil::initializeModule($mod_name);
} catch(AgaviDisabledModuleException $e) {
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/lib/database/models/NsmPrincipal.php
^
|
| @@ -52,18 +52,18 @@
return true;
}
- if ($this->principal_role_id > 0 && $this->principal_user_id > 0) {
+ if ($this->principal_role_id && $this->principal_user_id) {
throw new AppKitDoctrineException('Unexpected principal condition, please check the object');
}
- if ($this->principal_role_id > 0) {
+ if ($this->principal_role_id) {
$this->principal_type = self::TYPE_ROLE;
}
- elseif($this->principal_user_id > 0) {
+ elseif($this->principal_user_id) {
$this->principal_type = self::TYPE_USER;
}
return true;
}
-}
\ No newline at end of file
+}
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/lib/js/AppKitErrorHandler.js
^
|
| @@ -296,7 +296,7 @@
break;
case 404:
AppKit.AjaxErrorHandler.error_404(proxy.url);
- break;
+ break;new E
case 401:
AppKit.AjaxErrorHandler.error_401(proxy.url);
break;
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/lib/js/AppKitNavBar.js
^
|
| @@ -15,13 +15,13 @@
layout: 'column',
id: 'menu',
border: false,
- defaults: { style: { borderLeft: '1px #d0d0d0 solid' }, border: false, height: 40 }
+ defaults: {style: {borderLeft: '1px #d0d0d0 solid'}, border: false, height: 40}
},
// default config for the menubar field
tbarCfg: {
id: 'menu-navigation',
- defaults: { border: false, style: 'margin:2px' },
+ defaults: {border: false, style: 'margin:2px'},
style: 'border: none',
height: 35,
items: {},
@@ -48,6 +48,7 @@
if(Ext.getCmp(this.defaultCfg.id))
throw("Menubar is already loaded");
Ext.apply(this,cfg);
+
this.buildNavBar();
this.buildIconField();
Ext.apply(cfg,this.defaultCfg);
@@ -102,9 +103,18 @@
initMenuItems : function(cfg) {
cfg.items = [];
this.addMenuFields(cfg.items,this.menuData);
+ cfg.items.push({xtype : 'tbfill'});
+ this.addClock(cfg.items);
+
this.addUserFields(cfg.items);
},
+ addClock : function(itemsCfg) {
+ var item = new AppKit.util.Servertime();
+ AppKit.log(item)
+ itemsCfg.push({xtype: 'container',items:item});
+ },
+
addMenuFields : function(itemsCfg,menuData) {
for(var i=0;i<menuData.length;i++) {
@@ -145,7 +155,7 @@
}
}
- case 'window':
+ case 'window':
target.bodyStyle = target.style || "background-color: #ffffff";
return Ext.createDelegate(AppKit.util.contentWindow, this, [{
url: target.url
@@ -154,12 +164,13 @@
},
addUserFields : function(itemsCfg) {
- itemsCfg.push({xtype : 'tbfill'});
+
var userField = {
iconCls: this.hasAuth ? 'icinga-icon-user' : 'icinga-icon-user-delete',
text: this.username
}
if(this.hasAuth) {
+
userField.menu = {};
userField.menu.items = {
xtype: 'buttongroup',
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/lib/js/icinga/grid/GridFactory.js
^
|
| @@ -160,4 +160,4 @@
load: loadFunction
}
}
-}
+};
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/lib/js/icinga/grid/plugins/PageableGrid.js
^
|
| @@ -40,4 +40,4 @@
}
this.constructor.apply(this,arguments);
-}
+};
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/lib/js/icinga/grid/plugins/SortableGrid.js
^
|
| @@ -17,4 +17,4 @@
}
this.constructor.apply(this,arguments);
-}
+};
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/lib/js/request/Ajax.js
^
|
| @@ -27,4 +27,4 @@
o.params.params = Ext.encode(p);
return Ext.data.Connection.prototype.request.call(this,o);
-}
+};
|
|
[-]
[+]
|
Added |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/lib/js/utils/AppKitServertime.js
^
|
| @@ -0,0 +1,33 @@
+/*
+ * Little widget that displays the currents servertime
+ *
+ */
+Ext.ns('AppKit.util');
+
+AppKit.util.Servertime = Ext.extend(Ext.menu.BaseItem, {
+ TIME_URL: '/modules/appkit/servertime',
+ updateClock: function () {
+ this.getEl().getUpdater().showLoadIndicator = false;
+
+ this.getEl().load({
+ url:AppKit.c.path+this.TIME_URL
+ });
+ },
+ constructor: function(cfg) {
+ cfg = cfg || {};
+ Ext.TaskMgr.start({
+ run: this.updateClock,
+ interval: 10000,
+ scope:this
+ });
+ cfg.style = {margin : "3px"};
+ Ext.menu.BaseItem.prototype.constructor.call(this,cfg);
+
+ },
+ // private
+ onRender : function(container, position){
+ Ext.menu.BaseItem.superclass.onRender.apply(this, arguments);
+ }
+
+});
+
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/lib/translator/AppKitTranslationManager.class.php
^
|
| @@ -8,7 +8,36 @@
*/
class AppKitTranslationManager extends AgaviTranslationManager {
private $__localeLoaded = false;
+ public function initialize(AgaviContext $context, array $parameters = array()) {
+ $this->context = $context;
+ include(AgaviConfigCache::checkConfig(AgaviConfig::get('core.config_dir') . '/translation.xml'));
+ $this->loadSupplementalData();
+ $this->loadTimeZoneData();
+ $this->loadAvailableLocales();
+
+
+
+ if($this->defaultLocaleIdentifier === null) {
+ throw new AgaviException('Tried to use the translation system without a default locale and without a locale set');
+ }
+ $this->setLocale($this->defaultLocaleIdentifier);
+
+ if($this->defaultTimeZone === null) {
+ $this->defaultTimeZone = date_default_timezone_get();
+ } else {
+ date_default_timezone_set($this->defaultTimeZone);
+ }
+
+
+ if($this->defaultTimeZone === 'System/Localtime') {
+ // http://trac.agavi.org/ticket/1008
+ throw new AgaviException("Your default timezone is 'System/Localtime', which will causes problems with icinga-web date function."
+ ."Please set date.timezone in your php.ini or set a default timezone in the app/config/translations.xml file of icinga-web.");
+ }
+
+ }
+
public function loadCurrentLocale() {
if ($this->__localeLoaded) {
return parent::loadCurrentLocale();
|
|
[-]
[+]
|
Added |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/templates/ServertimeSuccess.php
^
|
| @@ -0,0 +1,6 @@
+<div>
+Servertime:
+<?php
+ echo date("H:i:s");
+?>
+</div>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/validate/Servertime.xml
^
|
| @@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ae:configurations
+ xmlns="http://agavi.org/agavi/config/parts/validators/1.0"
+ xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0"
+ parent="%core.module_dir%/AppKit/config/validators.xml"
+>
+
+ <ae:configuration>
+
+ <validators>
+ </validators>
+
+ </ae:configuration>
+
+</ae:configurations>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
icinga-web-1.5.1.tar.bz2/app/modules/AppKit/views/ServertimeSuccessView.class.php
^
|
| @@ -0,0 +1,13 @@
+<?php
+
+class AppKit_ServertimeSuccessView extends AppKitBaseView
+{
+ public function executeSimple(AgaviRequestDataHolder $rd)
+ {
+ $this->setupHtml($rd);
+
+ $this->setAttribute('_title', 'Servertime');
+ }
+}
+
+?>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Cronks/actions/System/ViewProc/SendCommandAction.class.php
^
|
| @@ -43,10 +43,16 @@
$sender->setCommandName($command);
$sender->setSelection($selection);
$sender->setData($data);
- $sender->dispatchCommands();
-
- $this->setAttribute('ok', true);
- $this->setAttribute('error', null);
+ try {
+ $sender->dispatchCommands();
+
+ $this->setAttribute('ok', true);
+ $this->setAttribute('error', null);
+ } catch(Exception $e) {
+ $this->setAttribute("ok", false);
+ $this->setAttribute("error",$e->getMessage());
+ }
+
} else {
$this->setAttribute('ok', false);
$this->setAttribute('error', 'Authentification failed');
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Cronks/data/xml/to/icinga-tactical-overview-presets.xml
^
|
| @@ -61,12 +61,12 @@
<target>IcingaApiConstants::TARGET_HOST</target>
<columns>HOST_OBJECT_ID</columns>
<search_type>IcingaApiConstants::SEARCH_TYPE_COUNT</search_type>
- <filter>
- <columns>
- <column>HOST_CHECK_TYPE</column>
- <value>0</value>
- </columns>
- </filter>
+ <filters>
+ <filter>
+ <parameter name="field">HOST_CHECK_TYPE</parameter>
+ <parameter name="value">0</parameter>
+ </filter>
+ </filters>
</datasource>
<datasource id="NUM_ACTIVE_SERVICE_CHECKS">
@@ -74,12 +74,12 @@
<target>IcingaApiConstants::TARGET_SERVICE</target>
<columns>SERVICE_OBJECT_ID</columns>
<search_type>IcingaApiConstants::SEARCH_TYPE_COUNT</search_type>
- <filter>
- <columns>
- <column>SERVICE_CHECK_TYPE</column>
- <value>0</value>
- </columns>
- </filter>
+ <filters>
+ <filter>
+ <parameter name="field">SERVICE_CHECK_TYPE</parameter>
+ <parameter name="value">0</parameter>
+ </filter>
+ </filters>
</datasource>
<datasource id="NUM_PASSIVE_HOST_CHECKS">
@@ -87,12 +87,12 @@
<target>IcingaApiConstants::TARGET_HOST</target>
<columns>HOST_OBJECT_ID</columns>
<search_type>IcingaApiConstants::SEARCH_TYPE_COUNT</search_type>
- <filter>
- <columns>
- <column>HOST_CHECK_TYPE</column>
- <value>1</value>
- </columns>
- </filter>
+ <filters>
+ <filter>
+ <parameter name="field">HOST_CHECK_TYPE</parameter>
+ <parameter name="value">1</parameter>
+ </filter>
+ </filters>
</datasource>
<datasource id="NUM_PASSIVE_SERVICE_CHECKS">
@@ -100,12 +100,12 @@
<target>IcingaApiConstants::TARGET_SERVICE</target>
<columns>SERVICE_OBJECT_ID</columns>
<search_type>IcingaApiConstants::SEARCH_TYPE_COUNT</search_type>
- <filter>
- <columns>
- <column>SERVICE_CHECK_TYPE</column>
- <value>1</value>
- </columns>
- </filter>
+ <filters>
+ <filter>
+ <parameter name="field">SERVICE_CHECK_TYPE</parameter>
+ <parameter name="value">1</parameter>
+ </filter>
+ </filters>
</datasource>
</datasources>
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Cronks/lib/js/CronkBuilder.js
^
|
| @@ -610,6 +610,6 @@
Cronk.util.CronkBuilder.INSTANCE = new Cronk.util.CronkBuilder();
}
return Cronk.util.CronkBuilder.INSTANCE;
-}
+};
// ...
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Cronks/lib/js/JitStatusMap.js
^
|
| @@ -249,10 +249,13 @@
this.getMapDataFail = function (response, o) {
this.jitJson = {};
+ this.mask.hide();
+ this.mask.disable();
}
this.getMapDataDefault = function (options, success, request) {
-
+ this.mask.hide();
+ this.mask.disable();
}
this.init(config);
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Cronks/lib/js/grid/GridPanel.js
^
|
| @@ -98,7 +98,7 @@
fieldLabel: _('Link'),
width:350,
value: AppKit.util.Config.getBaseUrl()
- + "/web/customPortal/"
+ + "/modules/web/customPortal/"
+ urlParams
},
bbar: [{
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Cronks/lib/js/grid/IcingaCommandHandler.js
^
|
| @@ -422,7 +422,6 @@
});
}
},
-
success: function(f, a) {
oWin.close();
AppKit.notifyMessage(_('Command sent'), String.format(_('{0} command was sent successfully!'), command));
@@ -434,7 +433,8 @@
Ext.each(o.fields, function(item, index, arry) {
if (this.command_options.source[item]) return;
-
+ if(item == "author")
+ this.command_options.predefined[item] = AppKit.getPreferences()["author_name"];
var f = this.getField({
fieldLabel: item,
fieldName: item,
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Cronks/models/System/StatusMapModel.class.php
^
|
| @@ -82,7 +82,7 @@
$parentObjectId = $idPrefix . $row->HOST_PARENT_OBJECT_ID;
if (!array_key_exists($childObjectId, $hostReferences)) {
- // $hostReferences[$childObjectId] = $hosts[$childObjectId];
+ $hostReferences[$childObjectId] = $hosts[$childObjectId];
}
unset($hosts[$childObjectId]);
|
|
[-]
[+]
|
Added |
icinga-web-1.5.1.tar.bz2/app/modules/Reporting/config/module.xml.in
^
|
| @@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ae:configurations xmlns="http://agavi.org/agavi/config/parts/module/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
+
+ <ae:configuration>
+
+ <module enabled="true">
+ <settings>
+ <!-- META -->
+ <setting name="title">Reporting Module</setting>
+ <setting name="version">1.0</setting>
+
+ <setting name="authors">
+ <ae:parameter name="info@icinga.org">Icinga Development Team</ae:parameter>
+ </setting>
+
+ <setting name="homepage">http://www.icinga.org</setting>
+ <setting name="update_url" />
+ <setting name="description">Seamless integration of jasper reporting into icinga-web</setting>
+
+ <!-- Reporting Javascript libs -->
+ <setting name="agavi.include.javascript">
+ <ae:parameter>%core.module_dir%/Reporting/config/javascript.xml</ae:parameter>
+ </setting>
+
+ <!-- Reporting cronks -->
+ <setting name="agavi.include.cronks">
+ <ae:parameter>%core.module_dir%/Reporting/config/cronks.xml</ae:parameter>
+ </setting>
+
+ <!-- Module routing table -->
+ <setting name="agavi.include.routing">
+ <ae:parameter>%core.module_dir%/Reporting/config/routing.xml</ae:parameter>
+ </setting>
+
+ <!-- Temp report generation dir -->
+ <setting name="dir.download">%core.module_dir%/Reporting/data/tmp</setting>
+
+ <!-- Previewable mime types -->
+ <setting name="preview.mime_regex"><![CDATA[/^(image|text)\/.+|application\/xml|application\/pdf.+/i]]></setting>
+
+ <!-- Previewable ws types (Jasper short form) -->
+ <setting name="preview.jasper_resources">
+ <ae:parameter>com.jaspersoft.jasperserver.api.metadata.common.domain.FileResource</ae:parameter>
+ <ae:parameter>com.jaspersoft.jasperserver.api.metadata.common.domain.ContentResource</ae:parameter>
+ </setting>
+
+ <!-- Resource type icon classes -->
+ <setting name="icon.wsType.mapping">
+ <ae:parameter name="reportUnit">icinga-icon-report</ae:parameter>
+ <ae:parameter name="bean">icinga-icon-bean</ae:parameter>
+ <ae:parameter name="contentResource">icinga-icon-report-run</ae:parameter>
+ <ae:parameter name="datasource">icinga-icon-database</ae:parameter>
+ <ae:parameter name="dataType">icinga-icon-cog</ae:parameter>
+ <ae:parameter name="folder"></ae:parameter>
+ <ae:parameter name="font">icinga-icon-document</ae:parameter>
+ <ae:parameter name="img">icinga-icon-image</ae:parameter>
+ <ae:parameter name="inputControl">icinga-icon-ui-text-field</ae:parameter>
+ <ae:parameter name="jar">icinga-icon-jar</ae:parameter>
+ <ae:parameter name="jdbc">icinga-icon-databases-relation</ae:parameter>
+ <ae:parameter name="jndi">icinga-icon-folder-network</ae:parameter>
+ </setting>
+
+ <!-- Parameter and datatype mapping -->
+ <setting name="parameter.mapping.name">
+ <ae:parameter name="p_host_object_id">
+ <ae:parameter name="className">Icinga.Reporting.inputControl.ApiSelectionField</ae:parameter>
+ <ae:parameter name="target">host</ae:parameter>
+ <ae:parameter name="valueField">HOST_OBJECT_ID</ae:parameter>
+ <ae:parameter name="displayField">HOST_NAME</ae:parameter>
+ </ae:parameter>
+ <ae:parameter name="p_hostgroup_object_id">
+ <ae:parameter name="className">Icinga.Reporting.inputControl.ApiSelectionField</ae:parameter>
+ <ae:parameter name="target">hostgroup</ae:parameter>
+ <ae:parameter name="valueField">HOSTGROUP_OBJECT_ID</ae:parameter>
+ <ae:parameter name="displayField">HOSTGROUP_NAME</ae:parameter>
+ </ae:parameter>
+
+ <ae:parameter name="p_service_object_id">
+ <ae:parameter name="className">Icinga.Reporting.inputControl.ApiSelectionField</ae:parameter>
+ <ae:parameter name="target">service</ae:parameter>
+ <ae:parameter name="valueField">SERVICE_OBJECT_ID</ae:parameter>
+ <ae:parameter name="displayField">SERVICE_NAME</ae:parameter>
+ </ae:parameter>
+ </setting>
+
+ <setting name="parameter.mapping.type">
+ <ae:parameter name="2">
+ <ae:parameter name="className">Ext.form.DateField</ae:parameter>
+ <ae:parameter name="format">Y-m-d H:i:s</ae:parameter>
+ <!-- H:i:s -->
+ </ae:parameter>
+ </setting>
+
+ <!--
+ Jasperserver configuration:
+ Use the setting names to configure your cronk, in the following case:
+
+ - modules.reporting.jasperconfig.default
+ - modules.reporting.jasperconfig.custom1
+ -->
+
+ <!-- Jasper configurations -->
+ <setting name="jasperconfig.default">
+ <ae:parameter name="jasper_url">http://10.121.0.95:8080/jasperserver</ae:parameter>
+ <ae:parameter name="jasper_user">jasperadmin</ae:parameter>
+ <ae:parameter name="jasper_pass">jasperadmin</ae:parameter>
+ <ae:parameter name="tree_root">/Icinga/reports</ae:parameter>
+ </setting>
+
+ <!-- Custom config if I have more that once -->
+ <!--
+ <setting name="jasperconfig.custom1">
+ <ae:parameter name="jasper_url">http://127.0.0.175/jasperserver</ae:parameter>
+ <ae:parameter name="jasper_user">custom_user</ae:parameter>
+ <ae:parameter name="jasper_pass">custom_passwd</ae:parameter>
+ </setting>
+ -->
+
+ </settings>
+ </module>
+
+ </ae:configuration>
+
+ <!-- Try include the overwriting file -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="@web_conf_folder@/reporting.xml#xmlns(ae=http://agavi.org/agavi/config/global/envelope/1.0)xpointer(ae:configurations/node())">
+ <xi:fallback></xi:fallback>
+ </xi:include>
+
+</ae:configurations>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Web/config/module.xml
^
|
| @@ -18,10 +18,7 @@
<setting name="agavi.include.routing">
<ae:parameter>%core.module_dir%/Web/config/routing.xml</ae:parameter>
</setting>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module.site.xml">
- <xi:fallback></xi:fallback>
- </xi:include>
+
</module>
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/app/modules/Web/lib/js/SimpleDataProvider.js
^
|
| @@ -181,4 +181,4 @@
],
target: target
});
-}
+};
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/configure
^
|
| @@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for icinga-web 1.5.0.
+# Generated by GNU Autoconf 2.67 for icinga-web 1.5.1.
#
# Report bugs to <dev.icinga.org>.
#
@@ -552,8 +552,8 @@
# Identity of this package.
PACKAGE_NAME='icinga-web'
PACKAGE_TARNAME='icinga-web'
-PACKAGE_VERSION='1.5.0'
-PACKAGE_STRING='icinga-web 1.5.0'
+PACKAGE_VERSION='1.5.1'
+PACKAGE_STRING='icinga-web 1.5.1'
PACKAGE_BUGREPORT='dev.icinga.org'
PACKAGE_URL=''
@@ -1231,7 +1231,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures icinga-web 1.5.0 to adapt to many kinds of systems.
+\`configure' configures icinga-web 1.5.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1292,7 +1292,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of icinga-web 1.5.0:";;
+ short | recursive ) echo "Configuration of icinga-web 1.5.1:";;
esac
cat <<\_ACEOF
@@ -1411,7 +1411,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-icinga-web configure 1.5.0
+icinga-web configure 1.5.1
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1428,7 +1428,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by icinga-web $as_me 1.5.0, which was
+It was created by icinga-web $as_me 1.5.1, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -1778,7 +1778,7 @@
# Release date
-RELEASE_DATE=2011-08-24
+RELEASE_DATE=2011-08-26
@@ -2760,7 +2760,7 @@
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/icingaScheduler/config.php pub/Makefile etc/Makefile bin/Makefile doc/Makefile app/Makefile etc/sitecfg/Makefile app/config/databases.xml app/config/icinga.xml app/config/logging.xml app/config/settings.xml app/config/translation.xml app/modules/Api/config/access.xml app/modules/AppKit/config/module.xml app/modules/AppKit/config/auth.xml app/modules/Cronks/config/module.xml etc/build.properties tests/phpunit/test.properties etc/apache2/icinga-web.conf etc/scheduler/icingaCron bin/clearcache.sh pub/.htaccess pub/soap/.htaccess"
+ac_config_files="$ac_config_files Makefile lib/Makefile lib/icingaScheduler/config.php pub/Makefile etc/Makefile bin/Makefile doc/Makefile app/Makefile etc/sitecfg/Makefile app/config/databases.xml app/config/icinga.xml app/config/logging.xml app/config/settings.xml app/config/translation.xml app/modules/Api/config/access.xml app/modules/AppKit/config/module.xml app/modules/AppKit/config/auth.xml app/modules/Cronks/config/module.xml app/modules/Reporting/config/module.xml etc/build.properties tests/phpunit/test.properties etc/apache2/icinga-web.conf etc/scheduler/icingaCron bin/clearcache.sh pub/.htaccess pub/soap/.htaccess"
cat >confcache <<\_ACEOF
@@ -3305,7 +3305,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by icinga-web $as_me 1.5.0, which was
+This file was extended by icinga-web $as_me 1.5.1, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3358,7 +3358,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-icinga-web config.status 1.5.0
+icinga-web config.status 1.5.1
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
@@ -3487,6 +3487,7 @@
"app/modules/AppKit/config/module.xml") CONFIG_FILES="$CONFIG_FILES app/modules/AppKit/config/module.xml" ;;
"app/modules/AppKit/config/auth.xml") CONFIG_FILES="$CONFIG_FILES app/modules/AppKit/config/auth.xml" ;;
"app/modules/Cronks/config/module.xml") CONFIG_FILES="$CONFIG_FILES app/modules/Cronks/config/module.xml" ;;
+ "app/modules/Reporting/config/module.xml") CONFIG_FILES="$CONFIG_FILES app/modules/Reporting/config/module.xml" ;;
"etc/build.properties") CONFIG_FILES="$CONFIG_FILES etc/build.properties" ;;
"tests/phpunit/test.properties") CONFIG_FILES="$CONFIG_FILES tests/phpunit/test.properties" ;;
"etc/apache2/icinga-web.conf") CONFIG_FILES="$CONFIG_FILES etc/apache2/icinga-web.conf" ;;
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/configure.ac
^
|
| @@ -317,7 +317,7 @@
AC_CONFIG_FILES([
Makefile
lib/Makefile
- lib/icingaScheduler/config.php
+ lib/icingaScheduler/config.php
pub/Makefile
etc/Makefile
bin/Makefile
@@ -329,14 +329,15 @@
app/config/logging.xml
app/config/settings.xml
app/config/translation.xml
- app/modules/Api/config/access.xml
+ app/modules/Api/config/access.xml
app/modules/AppKit/config/module.xml
app/modules/AppKit/config/auth.xml
app/modules/Cronks/config/module.xml
+ app/modules/Reporting/config/module.xml
etc/build.properties
tests/phpunit/test.properties
etc/apache2/icinga-web.conf
- etc/scheduler/icingaCron
+ etc/scheduler/icingaCron
bin/clearcache.sh
pub/.htaccess
pub/soap/.htaccess
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/doc/CHANGELOG
^
|
| @@ -1,3 +1,285 @@
+2011-08-26 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: dd70358ef51fc7838f8367fedd9a1b14bcdb1375
+
+* Fixed installation issue and set fallback timezone if none is provided
+
+
+2011-08-26 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: e1cdb8b3fad8665b428a1c2bfc7b2cd57540e574
+
+* Removed test module from context
+
+
+2011-08-26 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 51f9a755d0b6924f7c1d8456122c3d006f1e4100
+
+* status map now hides layer if an error occurs and doesn'T freeze interface
+
+
+2011-08-26 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: 35e4ca340cecc990e16f23fca3cebc8dbfe510c0
+
+* Fixed wrong url in custom portal
+
+
+2011-08-26 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: dab5124eed2473b5b56d34f49c164f54e7385ff5
+
+* fixed status map
+
+
+2011-08-26 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: d25bada97c563fee9a4fa565aeb83d552fd4c94b
+
+* Fixed command author name being cached in template, added hint for timezone
+ problems to translation.xml.in
+
+
+2011-08-26 Eric Lippmann <eric(DOT)lippmann(AT)netways(DOT)de>
+ Commit: 5572c3ebfaf8851833e13b929392e252a20ae37c
+
+* Added missing semicolons to critical places
+
+
+2011-08-26 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: bbeeef5239fd218db9d9978f51754d76f47d6009
+
+* Added static join in host_status, should fix wrong state information
+
+
+2011-08-26 Michael Friedrich <michael(DOT)friedrich(AT)univie(DOT)ac(DOT)at>
+ Commit: 5aa8ce2393eba6f15fd88d33894122ec8808d160
+
+* correct retained config_type selection in doctrine legacy layer, add description
+ how to be used
+
+
+2011-08-26 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 0084ed2fb1c71c54cf298adb2cd28715e302ad8e
+
+* Fixed flipped retained state selection
+
+
+2011-08-26 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 3ef22e8ff499c02701fb8dd7980521d010938fb1
+
+* Cleaned up default configs (comment separations, default db settings)
+
+
+2011-08-26 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: d2b945cf75ea2c1a256f1866aafefc9b994f78a5
+
+* Added field displaying current servertime to indicate timezone errors to menu
+
+
+2011-08-26 Eric Lippmann <eric(DOT)lippmann(AT)netways(DOT)de>
+ Commit: 716876c8cf6784bf02b2806ae84e01402dc886b0
+
+* Fixed AppkitResourceConfigHandler possibly including same file multiple times
+
+
+2011-08-26 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 92d59b76bfbd79e207b11bf6b474c18d64a62a45
+
+* Fixed log dir not being created
+
+
+2011-08-26 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: c360030799df9f5f93ce9bc969a89bd0336c2ada
+
+* typo error
+
+
+2011-08-26 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 70300b073cc71cfd2daf269e432921b84c395b66
+
+* Changed www-user error to a more general version
+
+
+2011-08-26 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: e60273a6dfa1b94fc09c6a39a42dd4d0feca8736
+
+* Command sending errors now are more verbose and will be send
+
+
+2011-08-26 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 11811e73c6229548c0ecdb6c6c6af586254e690f
+
+* Removed deprecated site.xml link
+
+
+2011-08-26 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 127d41fa74dff5af1c04569fc427f0235db7e076
+
+* Readded default.timezone and added default timezone set before agavi check
+
+
+2011-08-26 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: b1fed8f55cfd5c426074ce12cf4e3a3270441a95
+
+* Export reporting cronk configuration (fixes #1846)
+
+
+2011-08-26 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: ecdfddc01ee68666fd99dce48c83f22c8134ef7c
+
+* Export reporting cronk configuration (fixes #1846)
+
+
+2011-08-26 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: fd59b848a36f17ebf4d628f32be740edb20d358f
+
+* Removed JS files from PHP syntax check
+
+
+2011-08-25 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: b8037f4e0133ff5e4dd60c4abf9b221bba39946f
+
+* Added use_retained to database config
+
+
+2011-08-25 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 8dcae6ad8bcbf232b116c3569ba41fd98e61752e
+
+* Wrong comments on access.xml
+
+
+2011-08-25 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 55ee11bb6cf559ed880ee4b69634c0e1b53c5268
+
+* Fixed access.xml from siteconfig
+
+
+2011-08-25 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: 8b0cff16018726ad0ae4884b8ed8f8187f0c08be
+
+* LDAP fix based on doctrine bug?
+
+
+2011-08-25 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 2f66fe0d5f2f6d55161340b7d3084d960406e960
+
+* Fixed active/passive performance view in hostgroups-to
+
+
+2011-08-25 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 4f31d2310dfa722d4e0b10e430f3857d5ec9c274
+
+* Fixed aliased count fields in legacy api
+
+
+2011-08-25 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 8a0b76a7ad6f6f0aa2bee2fe05ba1f7aa8a494d7
+
+* Adde missing alias
+
+
+2011-08-25 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 8c48ca9b13b079365e5651c3c82596b85732ec2a
+
+* Fixed status map freeze in some cases
+
+
+2011-08-24 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 3f0aae0cdb8b6ec24c6a22bd9ddad07d68d0d006
+
+* added databases namespace to example template documentation
+
+
+2011-08-24 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: ba34b991a9b209f1f1015f38121dfc68e991ee4a
+
+* Fixed cronks including
+
+
+2011-08-24 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: 09d771ccac146bcd50dd43c40cfb663e74191190
+
+* distclean fixes
+
+
+2011-08-24 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: 34fc5778033311654f9c5ae83133fa2a47ac071f
+
+* configure fixes for finding binaries
+
+
+2011-08-24 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: f34354e17cf77143cb8192d29a31bebd34e3dcac
+
+* fixed log, fixed data overflow on wrong ssh key
+
+
+2011-08-24 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: 5d82ce5f1b2a6c5630da56ba575e094f8f3009a6
+
+* fixes #1839
+* removed configured files
+* changed gitignore to match configure output
+
+
+2011-08-24 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: 6da75677485ec753451416ebef578329da7b5748
+
+* fixes #1839
+* removed configured files
+* changed gitignore to match configure output
+
+
+2011-08-24 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: b1693d94abc3224eb48d80af8dde4b0c04fb5474
+
+* Changed meta things
+
+
+2011-08-24 Jannis Moßhammer <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 17a828b235439ab7a254170b3de99410987478aa
+
+* update in contrib
+
+
+2011-08-24 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: c16c697be83183b13f7cbd6bffb97cfb91f5bdd5
+
+* updated api fallback route name
+
+
+2011-08-24 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: a245ca5411bef008cf63b0e0ca68cbcfaa39cd85
+
+* Updated contrib
+
+
+2011-08-24 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: 54697b206ed552073c6b30cee0aa6ef96bdf0749
+
+* Conform view for Instance status
+
+
+2011-08-23 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: 0ac2ea3a7c3b82366fffbf73d26d78684f5fdfc9
+
+* Changed submodule pointer
+
+
+2011-08-23 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: 3eb3c6e944e7e841cc2ffebebe4e30e0c79768d1
+
+* Fixed missing default conenction name in DataStoreModel
+
+
+2011-08-23 Jannis Moßhanner <jannis(DOT)mosshammer(AT)netways(DOT)de>
+ Commit: b23af03c303a095fa2baf146eb91d7ae68c53b0f
+
+* Fixed IcignaDoctrine_Query auto-alias resolve bug
+
+
+2011-08-23 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
+ Commit: e8cdfb8fa87a3abd6fb470625ae49c7ce2db4331
+
+* Updated changelog
+
+
2011-08-23 Marius Hein <marius(DOT)hein(AT)netways(DOT)de>
Commit: b90f058bc5479a89c31d8cc7f22dffd4842e982c
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/doc/VERSION
^
|
| @@ -1 +1 @@
-1.5
+1.5.1
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/etc/make/version.m4
^
|
| @@ -9,5 +9,5 @@
dnl this name.
dnl
-m4_define([ICINGA_VERSION], [1.5.0])
-m4_define([ICINGA_RELEASE_DATE], [2011-08-24])
+m4_define([ICINGA_VERSION], [1.5.1])
+m4_define([ICINGA_RELEASE_DATE], [2011-08-26])
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/etc/sitecfg/Makefile.in
^
|
| @@ -5,7 +5,7 @@
BINDIR=@bindir@
CGIDIR=@sbindir@
HTMLDIR=@datarootdir@
-
+WEB_CFG_DIR=@web_conf_folder@
INSTALL=@INSTALL@
INSTALL_OPTS=@INSTALL_OPTS@
@@ -15,9 +15,10 @@
$(INSTALL) -m 755 $(INSTALL_OPTS) settings.site.xml $(DESTDIR)$(prefix)/app/config/settings.site.xml
$(INSTALL) -m 755 $(INSTALL_OPTS) factories.site.xml $(DESTDIR)$(prefix)/app/config/factories.site.xml
- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/etc/conf.d
- $(INSTALL) -m 755 $(INSTALL_OPTS) access.xml $(DESTDIR)$(prefix)/etc/conf.d/access.xml
- $(INSTALL) -m 755 $(INSTALL_OPTS) auth.xml $(DESTDIR)$(prefix)/etc/conf.d/auth.xml
- $(INSTALL) -m 755 $(INSTALL_OPTS) databases.xml $(DESTDIR)$(prefix)/etc/conf.d/databases.xml
- $(INSTALL) -m 755 $(INSTALL_OPTS) cronks.xml $(DESTDIR)$(prefix)/etc/conf.d/cronks.xml
- $(INSTALL) -m 755 $(INSTALL_OPTS) translation.xml $(DESTDIR)$(prefix)/etc/conf.d/translation.xml
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)$(WEB_CFG_DIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) access.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/access.xml
+ $(INSTALL) -m 755 $(INSTALL_OPTS) auth.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/auth.xml
+ $(INSTALL) -m 755 $(INSTALL_OPTS) databases.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/databases.xml
+ $(INSTALL) -m 755 $(INSTALL_OPTS) cronks.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/cronks.xml
+ $(INSTALL) -m 755 $(INSTALL_OPTS) translation.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/translation.xml
+ $(INSTALL) -m 755 $(INSTALL_OPTS) reporting.xml $(DESTDIR)$(prefix)$(WEB_CFG_DIR)/reporting.xml
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/etc/sitecfg/access.xml
^
|
| @@ -1,130 +1,120 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- access.xml
- This files defines which hosts exist, which icinga-instance they represent and which actions can be performed on them.
-
- It conists of three parts: instances, defaults and hosts:
- -instances:
- Simple mapping of instance names to host names,
+<ae:configurations xmlns="http://icinga.org/api/config/parts/access/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
+ <ae:configuration>
- -defaults:
- Defines read, write, and execute access on files an folders that are used if hosts have the useDefaults flag active
- Rules will be accessed by their rules, especially important is the icinga_service, icinga_bin and icinga_pipe rules,
- which define where the service control, the binary and the icinga pipe can be found
-
- -hosts
- Defines hosts/servers that can be accessed via icinga-web and which rules to use for them
- The type can be either 'local', which means that actions will be performed directly on this system or 'ssh', which means
- that the host will be accessed via ssh (see example below). Not that you need php-libssh2 to use this
+<!--
+ Map your instances to hosts here
+ -->
+ <instances>
+ <!--
+ <instance name="default">localhost</instance>
--->
-
-<settings prefix="modules.api.access." xmlns="http://agavi.org/agavi/config/parts/module/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
-
- <!-- Map your instances to hosts here -->
- <setting name="instances">
- <!--
- example: map instance default to localhost
- <ae:parameter name="default">localhost</ae:parameter>
-
-->
- </setting>
+ </instances>
+<!--
+
+ Default settings that will be set if useDefaults is true
+ -->
+ <defaults>
+ <!--
+ <defaultHost>localhost</defaultHost>
+ <access>
+ allowed to read to and from
+ <readwrite>
+ <folders>
+ <resource name="icinga_objects">/usr/local/icinga/etc/objects</resource>
+ </folders>
+ <files>
+ <resource name="icinga_cfg">/usr/local/icinga/etc/icinga.cfg</resource>
+ </files>
+ </readwrite>
+ allowed to be read from
+ <read>
+ </read>
+ allowed to be written to
+ <write>
+ <files>
+ <resource name="icinga_pipe">/usr/local/icinga/var/rw/icinga.cmd</resource>
+ </files>
+ </write>
+ allowed to be executed
+ <execute>
+ <files>
+ <resource name="icinga_service">/etc/init.d/icinga</resource>
+
+ <resource name="icinga_bin">/usr/local/icinga/bin/icinga</resource>
+ <resource name="echo">/bin/echo</resource>
+ <resource name="printf">printf</resource>
+ <resource name="cp">/bin/cp</resource>
+ <resource name="ls">/bin/ls</resource>
+ <resource name="grep">/bin/grep</resource>
+ </files>
+ </execute>
+ </access>
+ -->
+ </defaults>
+
+
+ <!-- Hosts that can be accessed via the console interface -->
+ <hosts><!--
+ <host name="localhost">
+ <type>local</type>
+ Only allow access to these files, folders or executables
+ <access useDefaults="true">
+ <read>
+ <files>
+ <resource name="test">test</resource>
+ </files>
+ </read>
+
+
+ </access>
+ </host>-->
+
+ <!-- Example for ssh connection with user/password auth -->
+<!-- <host name="vm_host1">
+ <type>ssh</type>
+ <ssh-config>
+ <host>localhost</host>
+ <port>22</port>
+ <auth>
+ <type>password</type>
+ <user>jmosshammer</user>
+ <password>test</password>
+ </auth>
+ </ssh-config>
+
+ <access useDefaults="true" />
+
+ </host>-->
+
<!--
- Default settings that will be set if useDefaults is true
- -->
- <setting name="defaults">
- <!--
- sets the default host to use
- <ae:parameter name="host">localhost</ae:parameter>
- -->
- <!--
- Define default access rights
- <ae:parameter name="access">
- <ae:parameter name="rw">
- <ae:parameter name="folders">
- </ae:parameter>
- <ae:parameter name="files">
- </ae:parameter>
- </ae:parameter>
- <ae:parameter name="r">
- </ae:parameter>
- <ae:parameter name="w">
- <ae:parameter name="files">
- <ae:parameter name="icinga_pipe">/usr/local/icinga/var/rw/icinga.cmd</ae:parameter>
- </ae:parameter>
- </ae:parameter>
- <ae:parameter name="x">
- <ae:parameter name="files">
- <ae:parameter name="icinga_service">/etc/init.d/icinga</ae:parameter>
- <ae:parameter name="icinga_bin">/usr/local/icinga/bin/icinga</ae:parameter>
- <ae:parameter name="echo">/bin/echo</ae:parameter>
- <ae:parameter name="printf">printf</ae:parameter>
- <ae:parameter name="cp">/bin/cp</ae:parameter>
- <ae:parameter name="ls">/bin/ls</ae:parameter>
- <ae:parameter name="grep">/bin/grep</ae:parameter>
- </ae:parameter>
- </ae:parameter>
- </ae:parameter>
- -->
- </setting>
-
-
- <!-- Hosts that can be accessed via the console interface -->
- <setting name="hosts">
- <!-- localhost overwrite
- <ae:parameter name="localhost">
- <ae:parameter name="type">local</ae:parameter>
-
- <ae:parameter name="access">
- <ae:parameter name="useDefaults">true</ae:parameter>
- </ae:parameter>
- </ae:parameter>
- -->
- <!-- Example for ssh connection with user/password auth -->
-<!-- <ae:parameter name="vm_host1">
- <ae:parameter name="type">ssh</ae:parameter>
- <ae:parameter name="ssh">
- <ae:parameter name="host">localhost</ae:parameter>
- <ae:parameter name="port">22</ae:parameter>
- <ae:parameter name="auth">
- <ae:parameter name="type">password</ae:parameter>
- <ae:parameter name="user">jmosshammer</ae:parameter>
- <ae:parameter name="password">test</ae:parameter>
- </ae:parameter>
- </ae:parameter>
- <ae:parameter name="access">
- <ae:parameter name="useDefaults">true</ae:parameter>
- </ae:parameter>
-
- </ae:parameter>
+ This is experimental, try to avoid password encrypted keyfiles when encountering errors
+ Example for ssh connection with pubkey auth
+ -->
+ <!--
+ <host name="vm_host2">
+ <type>ssh</type>
+ <ssh-config>
+ <host>localhost</ae:parameter>
+ <port>22</ae:parameter>
+ <auth>
+ <type>key</type>
+ <user>testuser</user>
+ <private-key>/usr/local/icinga-web/app/modules/Api/lib/.ssh/host1_rsa</private-key>
+ <password>secret123</password>
+ </auth>
+ </ssh-config>
+
+
+ <access useDefaults="true" />
+ </host>
+
-->
-<!--
- This is experimental, try to avoid password encrypted keyfiles when encountering errors
- Example for ssh connection with pubkey auth -->
-<!-- <ae:parameter name="vm_host2">
- <ae:parameter name="type">ssh</ae:parameter>
- <ae:parameter name="ssh">
- <ae:parameter name="host">localhost</ae:parameter>
- <ae:parameter name="port">22</ae:parameter>
- <ae:parameter name="auth">
- <ae:parameter name="type">key</ae:parameter>
- <ae:parameter name="user">testuser</ae:parameter>
- <ae:parameter name="pubKey">/usr/local/icinga-web/app/modules/Api/lib/.ssh/host1_rsa.pub</ae:parameter>
- <ae:parameter name="privKey">/usr/local/icinga-web/app/modules/Api/lib/.ssh/host1_rsa</ae:parameter>
- <ae:parameter name="password">secret123</ae:parameter>
- </ae:parameter>
- </ae:parameter>
-
-
- <ae:parameter name="access">
- <ae:parameter name="useDefaults">true</ae:parameter>
- </ae:parameter>
- </ae:parameter>
--->
-
- </setting>
+ </hosts>
-</settings>
+ </ae:configuration>
+</ae:configurations>
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/etc/sitecfg/cronks.xml
^
|
| @@ -4,7 +4,8 @@
<cronks>
<!--
Cronk overwrites - for example
-
+ -->
+ <!--
<cronk name="gridHostgroupSummary">
<ae:parameter name="module">Cronks</ae:parameter>
<ae:parameter name="action">System.ViewProc</ae:parameter>
@@ -23,14 +24,15 @@
<categories>
<!--
Category overwrites - for example:
-
+ -->
+ <!--
<category name="misc">
<ae:parameter name="title">Misc</ae:parameter>
<ae:parameter name="visible">true</ae:parameter>
<ae:parameter name="position">99</ae:parameter>
</category>
- -->
+ -->
</categories>
</ae:configuration>
</ae:configurations>
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/etc/sitecfg/databases.xml
^
|
| @@ -8,8 +8,10 @@
<databases xmlns:db="http://agavi.org/agavi/config/parts/databases/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
- <!-- Overwrite the icinga-web database (where users, roles, views, etc are stored
- EXAMPLE (oracle need icingaOracle as the db driver
+ <!--
+ Overwrite the icinga-web database (where users, roles, views, etc are stored
+ -->
+ <!--
<db:database name="icinga_web" class="AppKitDoctrineDatabase">
<ae:parameter name="dsn">mysql://icinga_web:icinga_web@localhost:3306/icinga_web</ae:parameter>
<ae:parameter name="charset">utf8</ae:parameter>
@@ -35,10 +37,15 @@
<!--
Overwrite the default database conneciton for icinga data retrieval
- <db:database xmlns="http://agavi.org/agavi/config/parts/databases/1.0" name="icinga" class="AppKitDoctrineDatabase">
- <ae:parameter name="dsn">mysql://icinga_test:test@localhost:3306/icinga_test</ae:parameter>
+ Make sure to use IcingaDoctrineDatabase, otherwise the use_retained parameter will be ignored
+ EXAMPLE (oracle needs icingaOracle as the db driver)
+ -->
+ <!--
+ <db:database xmlns="http://agavi.org/agavi/config/parts/databases/1.0" name="icinga" class="IcingaDoctrineDatabase">
+ <ae:parameter name="dsn">mysql://icinga:icinga@localhost:3306/icinga</ae:parameter>
<ae:parameter name="prefix">icinga_</ae:parameter>
<ae:parameter name="charset">utf8</ae:parameter>
+ <ae:parameter name="use_retained">true</ae:parameter>
<ae:parameter name="manager_attributes">
<ae:parameter name="Doctrine_Core::ATTR_MODEL_LOADING">CONSERVATIVE</ae:parameter>
</ae:parameter>
|
|
[-]
[+]
|
Added |
icinga-web-1.5.1.tar.bz2/etc/sitecfg/reporting.xml
^
|
| @@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ae:configurations xmlns="http://agavi.org/agavi/config/parts/module/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
+ <ae:configuration>
+
+ <!--
+ Overwrite or append your reporting cronk configuration
+ here
+ -->
+
+ <module enabled="true">
+ <!--
+ <settings>
+ <setting name="jasperconfig.default">
+ <ae:parameter name="jasper_url">http://127.0.0.1:8080/jasperserver</ae:parameter>
+ <ae:parameter name="jasper_user">jasperadmin</ae:parameter>
+ <ae:parameter name="jasper_pass">jasperadmin</ae:parameter>
+ <ae:parameter name="tree_root">/</ae:parameter>
+ </setting>
+ </settings>
+ -->
+ </module>
+
+ </ae:configuration>
+</ae:configurations>
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/etc/sitecfg/settings.site.xml
^
|
| @@ -4,6 +4,8 @@
<!--
* Disable whole application
Example how to overwrite settings from settings.xml
+ -->
+ <!--
<settings>
<setting name="available">false</setting>
</settings>
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/etc/sitecfg/translation.xml
^
|
| @@ -5,6 +5,8 @@
<!--
* Example to change locales
Stripping down available languages and set one as default
+ -->
+ <!--
<available_locales default_locale="de" default_timezone="GMT">
<available_locale identifier="de_DE">
<ae:parameter name="description">Deutsch</ae:parameter>
@@ -18,6 +20,8 @@
<!--
* Example changing date formats
Changing the tstamp format for icinga grids
+ -->
+ <!--
<translators default_domain="icinga.default">
<translator domain="date-tstamp">
<date_formatter>
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/pub/index.php
^
|
| @@ -8,7 +8,9 @@
header("Access-Control-Allow-Methods:POST GET UPDATE");
header("Access-Control-Allow-Headers: x-requested-with");
header("Access-Control-Max-Age: 720000");
-
+// just make sure a default timezone exists
+if(!ini_get("date.timezone"))
+ ini_set("date.timezone","GMT");
// +---------------------------------------------------------------------------+
// | An absolute filesystem path to the agavi/agavi.php script. |
// +---------------------------------------------------------------------------+
|
|
[-]
[+]
|
Added |
icinga-web-1.5.1.tar.bz2/tests/phpcs/YACS/_DEACT
^
|
| +(directory)
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/tests/phpcs/YACS/_DEACT/ClassFileNameSniff.php
^
|
| (renamed from tests/phpcs/YACS/Sniffs/Classes/ClassFileNameSniff.php)
|
|
[-]
[+]
|
Changed |
icinga-web-1.5.1.tar.bz2/tests/phpcs/YACS/_DEACT/ClassFileNameSniff.php
^
|
| (renamed from tests/phpcs/YACS/Sniffs/Classes/ClassFileNameSniff.php)
|
