[icinga-checkins] icinga.org: icinga-web/master: * Multi connections for grids (experimental) , removed Api from Statusmap code/refactored Statusmap backend, fixed unused Oracle connections being

git at icinga.org git at icinga.org
Wed Apr 11 14:39:57 CEST 2012


Module: icinga-web
Branch: master
Commit: a73f9559416476893eefdd08a8a1c87775f92eb3
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=a73f9559416476893eefdd08a8a1c87775f92eb3

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon Mar 26 17:55:36 2012 +0200

* Multi connections for grids (experimental), removed Api from Statusmap code/refactored Statusmap backend, fixed unused Oracle connections being
* opened even if not needed, improved multi-connection capability

---

 app/modules/Api/actions/ApiSearchAction.class.php  |  102 +-
 app/modules/Api/config/views/host.xml              |    1 +
 app/modules/Api/config/views/misc.xml              |   10 +-
 .../lib/database/IcingaDoctrineDatabase.class.php  |    7 +-
 .../generated/BaseIcingaAcknowledgements.php       |    5 +-
 .../models/generated/BaseIcingaCommands.php        |    5 +-
 .../models/generated/BaseIcingaCommenthistory.php  |    5 +-
 .../models/generated/BaseIcingaComments.php        |    5 +-
 .../models/generated/BaseIcingaConfigfiles.php     |    5 +-
 .../generated/BaseIcingaConfigfilevariables.php    |    5 +-
 .../models/generated/BaseIcingaConninfo.php        |    5 +-
 .../generated/BaseIcingaContactAddresses.php       |    5 +-
 .../BaseIcingaContactNotificationcommands.php      |    5 +-
 .../generated/BaseIcingaContactgroupMembers.php    |    5 +-
 .../models/generated/BaseIcingaContactgroups.php   |    5 +-
 .../BaseIcingaContactnotificationmethods.php       |    5 +-
 .../generated/BaseIcingaContactnotifications.php   |    5 +-
 .../models/generated/BaseIcingaContacts.php        |    5 +-
 .../models/generated/BaseIcingaContactstatus.php   |    5 +-
 .../models/generated/BaseIcingaCustomvariables.php |    5 +-
 .../generated/BaseIcingaCustomvariablestatus.php   |    5 +-
 .../models/generated/BaseIcingaDbversion.php       |    5 +-
 .../models/generated/BaseIcingaDowntimehistory.php |    5 +-
 .../models/generated/BaseIcingaEventhandlers.php   |    5 +-
 .../generated/BaseIcingaExternalcommands.php       |    5 +-
 .../models/generated/BaseIcingaFlappinghistory.php |    5 +-
 .../generated/BaseIcingaHostContactgroups.php      |    5 +-
 .../models/generated/BaseIcingaHostContacts.php    |    5 +-
 .../models/generated/BaseIcingaHostParenthosts.php |    5 +-
 .../models/generated/BaseIcingaHostchecks.php      |    5 +-
 .../generated/BaseIcingaHostdependencies.php       |    5 +-
 .../BaseIcingaHostescalationContactgroups.php      |    5 +-
 .../generated/BaseIcingaHostescalationContacts.php |    5 +-
 .../models/generated/BaseIcingaHostescalations.php |    5 +-
 .../generated/BaseIcingaHostgroupMembers.php       |    5 +-
 .../models/generated/BaseIcingaHostgroups.php      |    5 +-
 .../database/models/generated/BaseIcingaHosts.php  |   11 +-
 .../models/generated/BaseIcingaHoststatus.php      |    5 +-
 .../models/generated/BaseIcingaInstances.php       |    5 +-
 .../models/generated/BaseIcingaLogentries.php      |    5 +-
 .../models/generated/BaseIcingaNotifications.php   |    5 +-
 .../models/generated/BaseIcingaObjects.php         |    5 +-
 .../models/generated/BaseIcingaProcessevents.php   |    5 +-
 .../models/generated/BaseIcingaProgramstatus.php   |    5 +-
 .../generated/BaseIcingaRuntimevariables.php       |    5 +-
 .../generated/BaseIcingaScheduleddowntime.php      |    5 +-
 .../generated/BaseIcingaServiceContactgroups.php   |    5 +-
 .../models/generated/BaseIcingaServiceContacts.php |    5 +-
 .../models/generated/BaseIcingaServicechecks.php   |    5 +-
 .../generated/BaseIcingaServicedependencies.php    |    5 +-
 .../BaseIcingaServiceescalationContactgroups.php   |    5 +-
 .../BaseIcingaServiceescalationContacts.php        |    5 +-
 .../generated/BaseIcingaServiceescalations.php     |    5 +-
 .../generated/BaseIcingaServicegroupMembers.php    |    5 +-
 .../models/generated/BaseIcingaServicegroups.php   |    5 +-
 .../models/generated/BaseIcingaServices.php        |    5 +-
 .../models/generated/BaseIcingaServicestatus.php   |    5 +-
 .../models/generated/BaseIcingaSlahistory.php      |    5 +-
 .../models/generated/BaseIcingaStatehistory.php    |    5 +-
 .../models/generated/BaseIcingaSystemcommands.php  |    5 +-
 .../models/generated/BaseIcingaTimedeventqueue.php |    5 +-
 .../models/generated/BaseIcingaTimedevents.php     |    5 +-
 .../generated/BaseIcingaTimeperiodTimeranges.php   |    5 +-
 .../models/generated/BaseIcingaTimeperiods.php     |    5 +-
 .../datastore/IcingaApiDataStoreModel.class.php    |    7 +-
 .../Api/models/DBALMetaManagerModel.class.php      |    2 +-
 .../Api/models/LegacyApiContainerModel.class.php   |    4 +-
 .../Api/models/Views/ApiDQLViewModel.class.php     |   12 +-
 app/modules/Api/validate/ApiSearch.xml             |    7 +
 app/modules/AppKit/config/javascript.xml           |    2 +
 .../lib/database/AppKitDoctrineDatabase.class.php  |   24 +-
 app/modules/AppKit/lib/js/icinga/api/RESTStore.js  |    5 +-
 app/modules/AppKit/lib/js/ux/SmartUpdateGrid.js    |   40 +
 app/modules/AppKit/templates/Ext/HeaderSuccess.php |    1 -
 .../BPAddon/actions/ConfigCreaterAction.class.php  |   42 +
 .../actions/ConfigParserInterfaceAction.class.php  |   42 +
 .../BPAddon/actions/OverviewAction.class.php       |   42 +
 .../actions/eventRequestDelegateAction.class.php   |  108 ++
 .../BPAddon/actions/js/bpLoaderAction.class.php    |   23 +
 app/modules/BPAddon/config/autoload.xml            |   12 +
 app/modules/BPAddon/config/bp.xml                  |   15 +
 app/modules/BPAddon/config/config_handlers.xml     |    3 +
 app/modules/BPAddon/config/cronks.xml              |   54 +
 app/modules/BPAddon/config/css.xml                 |    8 +
 app/modules/BPAddon/config/javascript.xml          |   19 +
 app/modules/BPAddon/config/module.xml              |   47 +
 app/modules/BPAddon/config/routing.xml             |   14 +
 app/modules/BPAddon/config/validators.xml          |   15 +
 .../BPAddon/lib/action/BPAddonBaseAction.class.php |   11 +
 app/modules/BPAddon/lib/js/bpLoader.js             |  276 ++++
 app/modules/BPAddon/lib/js/eventGrid.js            |  169 +++
 app/modules/BPAddon/lib/js/filterManager.js        |  507 ++++++++
 app/modules/BPAddon/lib/js/infoPanel.js            |  302 +++++
 app/modules/BPAddon/lib/js/processVizPanel.js      |  150 +++
 .../BPAddon/lib/model/BPAddonBaseModel.class.php   |   11 +
 .../BPAddon/lib/view/BPAddonBaseView.class.php     |   11 +
 .../BPAddon/models/bpCfgInterpreterModel.class.php |  186 +++
 .../BPAddon/models/businessProcessModel.class.php  |  239 ++++
 .../BPAddon/models/configParserModel.class.php     |  175 +++
 app/modules/BPAddon/models/serviceModel.class.php  |   46 +
 app/modules/BPAddon/pub/styles/bp.css              |   38 +
 .../BPAddon/templates/ConfigCreaterSuccess.php     | 1311 ++++++++++++++++++++
 app/modules/BPAddon/templates/OverviewSuccess.php  |  832 +++++++++++++
 app/modules/BPAddon/validate/ConfigCreater.xml     |   81 ++
 .../BPAddon/validate/ConfigParserInterface.xml     |   43 +
 app/modules/BPAddon/validate/Overview.xml          |  106 ++
 .../BPAddon/validate/eventRequestDelegate.xml      |  104 ++
 app/modules/BPAddon/validate/js/bpLoader.xml       |   13 +
 .../views/ConfigCreaterSuccessView.class.php       |   14 +
 .../ConfigParserInterfaceSuccessView.class.php     |   55 +
 .../BPAddon/views/OverviewSuccessView.class.php    |   18 +
 .../eventRequestDelegateSuccessView.class.php      |   22 +
 .../BPAddon/views/js/bpLoaderSuccessView.class.php |   13 +
 .../Provider/ObjectInfoIconsAction.class.php       |    3 +-
 .../data/xml/grid/icinga-service-template.xml      |    2 -
 .../xml/grid/icinga-unhandled-host-problems.xml    |   11 +-
 app/modules/Cronks/lib/js/CronkUtil.js             |    1 -
 app/modules/Cronks/lib/js/Cronks/PortalView.js     |    2 -
 .../Cronks/lib/js/Cronks/StatusMap/Cronk.js        |    9 +-
 .../Cronks/lib/js/Cronks/StatusMap/RGraph.js       |   11 +-
 .../lib/js/Cronks/Tackle/Information/Head.js       |    8 +-
 .../Cronks/lib/js/Cronks/Tackle/ObjectGrid.js      |    2 +-
 app/modules/Cronks/lib/js/FilterHandler.js         |   15 +-
 app/modules/Cronks/lib/js/grid/GridPanel.js        |   84 ++-
 app/modules/Cronks/lib/js/grid/MetaGridCreator.js  |  550 ++++----
 .../renderer/AdvancedHostStatusColumnRenderer.js   |    3 +-
 .../lib/js/grid/renderer/CommentColumnRenderer.js  |    3 +-
 .../lib/js/grid/renderer/IcingaColumnRenderer.js   |    9 +-
 .../lib/js/grid/renderer/InfoIconColumnRenderer.js |    5 +-
 .../grid/renderer/ObjectInfoComponentRenderer.js   |   13 +-
 .../js/grid/renderer/StatusMapColumnRenderer.js    |    5 +-
 .../lib/template/CronkGridTemplateWorker.class.php |    8 +-
 .../CronkGridTemplateWorkerFactory.class.php       |    4 +-
 .../DQLCronkTemplateWorker.class.php               |    5 +-
 .../GenericCronkTemplateWorker.class.php           |   11 +-
 .../models/Provider/ObjectInfoIconsModel.class.php |    2 +-
 .../Cronks/models/System/StatusMapModel.class.php  |  167 +--
 .../System/ViewProc/AjaxGridLayoutSuccess.php      |    5 +-
 .../Cronks/validate/Provider/ObjectInfoIcons.xml   |   10 +-
 app/modules/Cronks/validate/System/StatusMap.xml   |    8 +-
 app/modules/Cronks/validate/System/ViewProc.xml    |    7 +
 .../views/System/StatusMapSuccessView.class.php    |    5 +-
 .../ViewProc/MetaInformationSuccessView.class.php  |    3 +-
 .../views/System/ViewProcSuccessView.class.php     |   12 +-
 .../.meta/xml/%PATH_Icinga%app_config_icinga.xml   |    6 +
 .../%PATH_Icinga%app_config_routing.modules.xml    |   47 +
 .../.meta/xml/%PATH_Icinga%app_config_routing.xml  |   20 +
 ...ATH_Icinga%app_modules_AppKit_config_module.xml |   12 +
 ...PATH_Icinga%app_modules_Web_config_autoload.xml |    6 +
 .../Cronks/CustomVarDNCollectorAction.class.php    |   40 +
 .../Backend/LConfCommandCheckAction.class.php      |   46 +
 .../Backend/LConfExportTaskAction.class.php        |   47 +
 .../actions/Backend/LDAPObjectsAction.class.php    |   34 +
 .../LConf/actions/Backend/PingAction.class.php     |   16 +
 .../actions/Backend/PrincipalsAction.class.php     |   63 +
 .../connectionManager/connectAction.class.php      |   35 +
 .../connectionListingAction.class.php              |   95 ++
 .../actions/Backend/getPropertiesAction.class.php  |   35 +
 .../actions/Backend/listDirectoryAction.class.php  |   35 +
 .../actions/Backend/listFiltersAction.class.php    |   37 +
 .../actions/Backend/modifyEntryAction.class.php    |   39 +
 .../actions/Backend/modifyFilterAction.class.php   |   27 +
 .../actions/Backend/modifyNodeAction.class.php     |   29 +
 .../actions/Backend/searchReplaceAction.class.php  |   37 +
 .../actions/Backend/snippetSearchAction.class.php  |   37 +
 .../LConf/actions/Interface/AboutAction.class.php  |   23 +
 .../actions/Interface/Admin/MainAction.class.php   |   31 +
 .../Interface/Admin/PrincipalsAction.class.php     |   32 +
 .../Interface/ViewMainEditorAction.class.php       |   31 +
 app/modules/LConf/config/.module.xml.swo           |  Bin 0 -> 24576 bytes
 app/modules/LConf/config/access.xml                |   51 +
 app/modules/LConf/config/autoload.xml              |   18 +
 app/modules/LConf/config/config_handlers.xml       |    3 +
 app/modules/LConf/config/css.xml                   |    8 +
 app/modules/LConf/config/javascript.xml            |   23 +
 app/modules/LConf/config/menu.xml                  |   37 +
 app/modules/LConf/config/module.xml                |  488 ++++++++
 app/modules/LConf/config/routing.xml               |   48 +
 .../templateExtensions/hostServiceGridExtender.xml |   43 +
 app/modules/LConf/config/validators.xml            |   14 +
 .../lib/action/IcingaLConfBaseAction.class.php     |   17 +
 app/modules/LConf/lib/database/LconfConnection.php |    5 +
 .../LConf/lib/database/LconfDefaultconnection.php  |    5 +
 app/modules/LConf/lib/database/LconfFilter.php     |   17 +
 app/modules/LConf/lib/database/LconfPrincipal.php  |    6 +
 .../lib/database/generated/BaseLconfConnection.php |  107 ++
 .../generated/BaseLconfDefaultconnection.php       |   76 ++
 .../lib/database/generated/BaseLconfFilter.php     |   80 ++
 .../lib/database/generated/BaseLconfPrincipal.php  |   67 +
 .../LConf/lib/js/Components/Configuration.js       |    5 +
 app/modules/LConf/lib/js/Components/DIT/DITTree.js |  221 ++++
 .../LConf/lib/js/Components/DIT/DITTreeLoader.js   |   65 +
 .../LConf/lib/js/Components/DIT/DNSearchField.js   |   64 +
 .../LConf/lib/js/Components/DIT/Helper/Debug.js    |   27 +
 .../LConf/lib/js/Components/DIT/Helper/KeyMap.js   |   88 ++
 .../js/Components/DIT/Helper/NodeWizardManager.js  |  137 ++
 .../Components/DIT/Helper/SearchReplaceManager.js  |  111 ++
 .../LConf/lib/js/Components/DIT/Mixin/Clipboard.js |   66 +
 .../lib/js/Components/DIT/Mixin/ContextMenu.js     |  137 ++
 .../lib/js/Components/DIT/Mixin/NodeModifier.js    |  265 ++++
 .../lib/js/Components/DIT/Mixin/TreeCrawler.js     |  120 ++
 .../lib/js/Components/Editors/ComboBoxFactory.js   |   34 +
 .../js/Components/Editors/EditorFieldManager.js    |   54 +
 .../lib/js/Components/Editors/GenericTextField.js  |    2 +
 .../LConf/lib/js/Components/Editors/SetFactory.js  |   82 ++
 .../LConf/lib/js/Components/EventDispatcher.js     |   22 +
 .../LConf/lib/js/Components/Filter/FilterState.js  |  120 ++
 .../LConf/lib/js/Components/Filter/FilterTree.js   |  410 ++++++
 .../PropertyGrid/Extensions/JumpToCheckCommand.js  |   48 +
 .../PropertyGrid/Extensions/TestCheckCommand.js    |   95 ++
 .../PropertyGrid/PropertyGridExtender.js           |  108 ++
 .../LConf/lib/js/Components/View/ConfigWizard.js   |   75 ++
 .../LConf/lib/js/Components/View/ConnectionList.js |  521 ++++++++
 .../LConf/lib/js/Components/View/DITPanel.js       |  139 +++
 .../LConf/lib/js/Components/View/FilterPanel.js    |  226 ++++
 .../lib/js/Components/View/PropertyManager.js      |  331 +++++
 .../lib/js/Components/View/SimpleSearchGrid.js     |   82 ++
 .../lib/js/Components/View/TestCheckWIndow.js      |  264 ++++
 .../LConf/lib/js/Components/View/Viewport.js       |   68 +
 app/modules/LConf/lib/js/GridTreeEditorField.js    |  245 ++++
 app/modules/LConf/lib/js/LoadingLayer.js           |   12 +
 app/modules/LConf/lib/js/MultiSelectTree.js        |  737 +++++++++++
 app/modules/LConf/lib/js/ldapColumn.js             |  116 ++
 .../lib/ldapConfig/objectDefaultAttributes.ini     |   62 +
 app/modules/LConf/lib/ldapConfig/staticObjects.ini |  145 +++
 .../LConf/lib/model/IcingaLConfBaseModel.class.php |   11 +
 .../LConf/lib/view/IcingaLConfBaseView.class.php   |   11 +
 app/modules/LConf/manifest.xml                     |   28 +
 .../Admin/LConfPrincipalAdminModel.class.php       |   68 +
 .../LConf/models/ConsoleCommandModel.class.php     |   14 +
 .../LConf/models/LConfCheckTestModel.class.php     |  108 ++
 .../LConf/models/LConfExporterModel.class.php      |  313 +++++
 app/modules/LConf/models/LDAPClientModel.class.php |  858 +++++++++++++
 .../models/LDAPConnectionManagerModel.class.php    |  261 ++++
 .../LConf/models/LDAPConnectionModel.class.php     |  200 +++
 .../LConf/models/LDAPFilterGroupModel.class.php    |  140 +++
 .../LConf/models/LDAPFilterManagerModel.class.php  |  134 ++
 app/modules/LConf/models/LDAPFilterModel.class.php |   87 ++
 app/modules/LConf/models/LDAPHelperModel.class.php |  162 +++
 app/modules/LConf/models/LDAPResultModel.class.php |   32 +
 .../LConf/models/LDAPSimpleSearchModel.class.php   |   85 ++
 .../SudoConsoleInterfaceDecoratorModel.class.php   |   64 +
 app/modules/LConf/pub/images/LConf_Logo.jpg        |  Bin 0 -> 58406 bytes
 app/modules/LConf/pub/images/LConf_Logo.pnh        |  Bin 0 -> 58406 bytes
 app/modules/LConf/pub/images/bypass.png            |  Bin 0 -> 7184 bytes
 app/modules/LConf/pub/images/tree.png              |  Bin 0 -> 1897 bytes
 app/modules/LConf/pub/images/tree_small.png        |  Bin 0 -> 784 bytes
 app/modules/LConf/pub/images/world.png             |  Bin 0 -> 2570 bytes
 app/modules/LConf/pub/styles/main.css              |  240 ++++
 .../LConf/templates/Interface/AboutSuccess.php     |   16 +
 .../templates/Interface/Admin/MainSuccess.php      |  386 ++++++
 .../Interface/Admin/PrincipalsSuccess.php          |  402 ++++++
 .../templates/Interface/ViewMainEditorSuccess.php  |  116 ++
 .../Backend/Cronks/CustomVarDNCollector.xml        |   32 +
 .../LConf/validate/Backend/LConfCommandCheck.xml   |   40 +
 .../LConf/validate/Backend/LConfExportTask.xml     |   26 +
 app/modules/LConf/validate/Backend/LDAPObjects.xml |   51 +
 app/modules/LConf/validate/Backend/Ping.xml        |   13 +
 app/modules/LConf/validate/Backend/Principals.xml  |   58 +
 .../validate/Backend/connectionManager/connect.xml |   33 +
 .../connectionManager/connectionListing.xml        |   39 +
 .../LConf/validate/Backend/getProperties.xml       |   25 +
 .../LConf/validate/Backend/listDirectory.xml       |   31 +
 app/modules/LConf/validate/Backend/listFilters.xml |   13 +
 app/modules/LConf/validate/Backend/modifyEntry.xml |   48 +
 .../LConf/validate/Backend/modifyFilter.xml        |   32 +
 app/modules/LConf/validate/Backend/modifyNode.xml  |   51 +
 .../LConf/validate/Backend/searchReplace.xml       |   54 +
 .../LConf/validate/Backend/snippetSearch.xml       |   38 +
 app/modules/LConf/validate/Interface/About.xml     |   13 +
 .../LConf/validate/Interface/Admin/Main.xml        |   13 +
 .../LConf/validate/Interface/Admin/Principals.xml  |   14 +
 .../LConf/validate/Interface/ViewMainEditor.xml    |   25 +
 .../CustomVarDNCollectorSuccessView.class.php      |   83 ++
 .../Backend/LConfCommandCheckSuccessView.class.php |   20 +
 .../Backend/LConfExportTaskErrorView.class.php     |   23 +
 .../Backend/LConfExportTaskSuccessView.class.php   |   22 +
 .../views/Backend/LDAPObjectsSuccessView.class.php |  117 ++
 .../LConf/views/Backend/PingSuccessView.class.php  |   13 +
 .../views/Backend/PrincipalsSuccessView.class.php  |   39 +
 .../connectionManager/connectSuccessView.class.php |   52 +
 .../connectionListingSuccessView.class.php         |   30 +
 .../Backend/getPropertiesSuccessView.class.php     |  101 ++
 .../Backend/listDirectorySuccessView.class.php     |   90 ++
 .../views/Backend/listFiltersSuccessView.class.php |   18 +
 .../views/Backend/modifyEntrySuccessView.class.php |   52 +
 .../Backend/modifyFilterSuccessView.class.php      |   53 +
 .../views/Backend/modifyNodeErrorView.class.php    |   55 +
 .../views/Backend/modifyNodeSuccessView.class.php  |   59 +
 .../Backend/searchReplaceSuccessView.class.php     |   57 +
 .../Backend/snippetSearchSuccessView.class.php     |   52 +
 .../views/Interface/AboutSuccessView.class.php     |   13 +
 .../Interface/Admin/MainSuccessView.class.php      |   18 +
 .../Admin/PrincipalsSuccessView.class.php          |   13 +
 .../Interface/ViewMainEditorSuccessView.class.php  |   21 +
 .../Web/models/Icinga/ApiContainerModel.class.php  |    4 +-
 .../lib/Doctrine/Connection/IcingaOracle.php       |   12 +-
 297 files changed, 18762 insertions(+), 607 deletions(-)

Diff:   https://git.icinga.org/?p=icinga-web.git;a=commitdiff;h=a73f9559416476893eefdd08a8a1c87775f92eb3




More information about the icinga-checkins mailing list