[Pkg-nagios-changes] [pkg-icingaweb2] 02/02: Merge branch 'master' into debmon-jessie
Alexander Wirt
formorer at debian.org
Tue Jun 30 21:55:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch debmon-jessie
in repository pkg-icingaweb2.
commit 8247a046ce268a09ea284cf276e00c1b07cc2149
Merge: 49bc8c6 480ce76
Author: Alexander Wirt <formorer at debian.org>
Date: Fri Jun 19 20:45:41 2015 +0200
Merge branch 'master' into debmon-jessie
Conflicts:
debian/changelog
AUTHORS | 8 +-
ChangeLog | 130 +++
RELEASE.md | 64 ++
VERSION | 2 +-
application/VERSION | 1 +
application/controllers/AboutController.php | 15 +
.../controllers/AuthenticationController.php | 2 +-
application/controllers/ConfigController.php | 148 +--
application/controllers/DashboardController.php | 3 +-
application/controllers/ErrorController.php | 39 +-
application/controllers/GroupController.php | 350 ++++++
application/controllers/ListController.php | 23 +-
.../{RolesController.php => RoleController.php} | 69 +-
application/controllers/UserController.php | 309 ++++++
.../controllers/UsergroupbackendController.php | 187 ++++
.../forms/Config/Resource/DbResourceForm.php | 10 +-
.../forms/Config/Resource/LdapResourceForm.php | 20 +-
.../forms/Config/Resource/SshResourceForm.php | 147 +++
application/forms/Config/ResourceConfigForm.php | 23 +-
.../forms/Config/User/CreateMembershipForm.php | 191 ++++
application/forms/Config/User/UserForm.php | 175 +++
.../DbBackendForm.php | 18 +-
.../ExternalBackendForm.php | 6 +-
.../LdapBackendForm.php | 50 +-
...endConfigForm.php => UserBackendConfigForm.php} | 87 +-
...dReorderForm.php => UserBackendReorderForm.php} | 10 +-
.../forms/Config/UserGroup/AddMemberForm.php | 182 ++++
.../Config/UserGroup/DbUserGroupBackendForm.php | 58 +
.../Config/UserGroup/LdapUserGroupBackendForm.php | 310 ++++++
.../Config/UserGroup/UserGroupBackendForm.php | 247 +++++
.../forms/Config/UserGroup/UserGroupForm.php | 126 +++
application/forms/ConfigForm.php | 2 +-
application/forms/ConfirmRemovalForm.php | 4 +-
application/forms/Dashboard/DashletForm.php | 6 +-
application/forms/PreferenceForm.php | 7 +-
application/forms/RepositoryForm.php | 389 +++++++
application/forms/Security/RoleForm.php | 37 +-
application/layouts/scripts/body.phtml | 43 +-
application/layouts/scripts/layout.phtml | 4 +-
application/locale/it_IT/LC_MESSAGES/icinga.po | 4 +-
application/locale/pt_BR/LC_MESSAGES/icinga.po | 4 +-
application/views/helpers/DateFormat.php | 133 ---
application/views/helpers/FormNumber.php | 2 -
application/views/scripts/about/index.phtml | 25 +
.../config/{application.phtml => general.phtml} | 0
application/views/scripts/config/modules.phtml | 10 +-
application/views/scripts/config/resource.phtml | 2 +-
.../{authentication => userbackend}/create.phtml | 0
.../{authentication => userbackend}/modify.phtml | 0
.../{authentication => userbackend}/remove.phtml | 0
.../{authentication => userbackend}/reorder.phtml | 4 +-
application/views/scripts/dashboard/index.phtml | 4 +-
application/views/scripts/dashboard/settings.phtml | 6 +-
application/views/scripts/error/error.phtml | 5 -
.../views/scripts/form/reorder-authbackend.phtml | 18 +-
application/views/scripts/group/form.phtml | 6 +
application/views/scripts/group/list.phtml | 78 ++
application/views/scripts/group/show.phtml | 82 ++
application/views/scripts/layout/menu.phtml | 2 +-
.../views/scripts/list/applicationlog.phtml | 13 +-
application/views/scripts/role/form.phtml | 6 +
.../scripts/{roles/index.phtml => role/list.phtml} | 8 +-
application/views/scripts/roles/new.phtml | 6 -
application/views/scripts/roles/remove.phtml | 6 -
application/views/scripts/roles/update.phtml | 6 -
application/views/scripts/user/form.phtml | 6 +
application/views/scripts/user/list.phtml | 78 ++
application/views/scripts/user/show.phtml | 111 ++
.../views/scripts/usergroupbackend/form.phtml | 6 +
.../views/scripts/usergroupbackend/list.phtml | 46 +
changelog.py | 148 +++
debian/changelog | 8 +-
doc/about.md | 70 ++
doc/authentication.md | 18 +-
doc/configuration.md | 15 +
doc/installation.md | 166 ++-
doc/preferences.md | 6 +-
doc/resources.md | 22 +-
doc/security.md | 258 +++++
etc/schema/mysql-upgrades/2.0.0beta3-2.0.0rc1.sql | 26 +
etc/schema/mysql.schema.sql | 16 +-
etc/schema/pgsql-upgrades/2.0.0beta3-2.0.0rc1.sql | 60 +
etc/schema/pgsql.schema.sql | 30 +-
icingaweb2.spec | 5 +-
.../Icinga/Application/ApplicationBootstrap.php | 23 +-
library/Icinga/Application/Config.php | 32 +-
library/Icinga/Application/EmbeddedWeb.php | 2 +-
library/Icinga/Application/Logger.php | 103 +-
.../Application/Logger/Writer/SyslogWriter.php | 2 +-
library/Icinga/Application/Modules/Manager.php | 52 +-
library/Icinga/Application/Modules/Module.php | 93 +-
library/Icinga/Application/Platform.php | 116 ++
library/Icinga/Application/Version.php | 37 +
library/Icinga/Application/webrouter.php | 2 +-
library/Icinga/Authentication/AuthChain.php | 6 +-
.../Authentication/Backend/DbUserBackend.php | 206 ----
.../Authentication/Backend/DbUserGroupBackend.php | 62 --
.../Authentication/Backend/IniUserGroupBackend.php | 64 --
.../Authentication/Backend/LdapUserBackend.php | 292 -----
library/Icinga/Authentication/Manager.php | 9 +-
.../Icinga/Authentication/User/DbUserBackend.php | 249 +++++
.../{Backend => User}/ExternalBackend.php | 61 +-
.../Icinga/Authentication/User/LdapUserBackend.php | 376 +++++++
library/Icinga/Authentication/User/UserBackend.php | 191 ++++
.../Authentication/User/UserBackendInterface.php | 41 +
library/Icinga/Authentication/UserBackend.php | 168 ---
.../UserGroup/DbUserGroupBackend.php | 264 +++++
.../UserGroup/IniUserGroupBackend.php | 121 +++
.../UserGroup/LdapUserGroupBackend.php | 627 +++++++++++
.../Authentication/UserGroup/UserGroupBackend.php | 171 +++
.../UserGroup/UserGroupBackendInterface.php | 37 +
library/Icinga/Authentication/UserGroupBackend.php | 112 --
library/Icinga/Chart/Axis.php | 14 +-
library/Icinga/Chart/GridChart.php | 18 +-
library/Icinga/Chart/PieChart.php | 6 +-
library/Icinga/Chart/Primitive/Path.php | 8 +-
library/Icinga/Chart/Primitive/PieSlice.php | 12 +-
library/Icinga/Chart/Primitive/Styleable.php | 10 +-
library/Icinga/Chart/Primitive/Text.php | 6 +-
library/Icinga/Chart/Unit/CalendarUnit.php | 6 +-
library/Icinga/Chart/Unit/LinearUnit.php | 2 +-
library/Icinga/Chart/Unit/LogarithmicUnit.php | 2 +-
library/Icinga/Chart/Unit/StaticAxis.php | 2 +-
library/Icinga/Cli/Params.php | 62 +-
library/Icinga/Data/Browsable.php | 20 -
library/Icinga/Data/ConfigObject.php | 38 +-
library/Icinga/Data/DataArray/ArrayDatasource.php | 232 +++-
library/Icinga/Data/Db/DbConnection.php | 209 +++-
library/Icinga/Data/Db/DbQuery.php | 277 ++++-
library/Icinga/Data/Extensible.php | 22 +
library/Icinga/Data/Fetchable.php | 6 +-
library/Icinga/Data/Filter/FilterChain.php | 39 +
library/Icinga/Data/Filter/FilterExpression.php | 1 -
library/Icinga/Data/PivotTable.php | 4 +-
library/Icinga/Data/QueryInterface.php | 2 +-
library/Icinga/Data/Reducible.php | 23 +
library/Icinga/Data/ResourceFactory.php | 9 +-
library/Icinga/Data/SimpleQuery.php | 211 +++-
library/Icinga/Data/Updatable.php | 24 +
library/Icinga/Date/DateFormatter.php | 255 +++++
library/Icinga/Exception/Http/HttpException.php | 13 +
.../Http/HttpMethodNotAllowedException.php | 39 +
.../Exception/Http/HttpNotFoundException.php | 11 +
.../Icinga/Exception/MissingParameterException.php | 32 +-
library/Icinga/Exception/StatementException.php | 8 +
library/Icinga/File/Csv.php | 4 +-
library/Icinga/File/Ini/IniEditor.php | 29 +-
library/Icinga/File/Ini/IniWriter.php | 2 +-
library/Icinga/Protocol/File/FileReader.php | 27 +-
library/Icinga/Protocol/File/LogFileIterator.php | 155 +++
library/Icinga/Protocol/Ldap/Capability.php | 3 +-
library/Icinga/Protocol/Ldap/Connection.php | 279 +++--
library/Icinga/Protocol/Ldap/Query.php | 343 ++----
library/Icinga/Protocol/Livestatus/Connection.php | 2 +-
library/Icinga/Repository/DbRepository.php | 755 +++++++++++++
library/Icinga/Repository/IniRepository.php | 186 ++++
library/Icinga/Repository/LdapRepository.php | 66 ++
library/Icinga/Repository/Repository.php | 892 +++++++++++++++
library/Icinga/Repository/RepositoryQuery.php | 589 ++++++++++
library/Icinga/Test/BaseTestCase.php | 4 +-
library/Icinga/User.php | 16 +-
library/Icinga/Util/Color.php | 3 +-
library/Icinga/Util/DateTimeFactory.php | 92 --
library/Icinga/Util/File.php | 2 +-
library/Icinga/Util/Format.php | 80 +-
library/Icinga/Util/String.php | 75 ++
library/Icinga/Util/Translator.php | 14 +-
library/Icinga/Web/Controller.php | 143 +++
library/Icinga/Web/Controller/ActionController.php | 27 +-
.../Web/Controller/AuthBackendController.php | 198 ++++
library/Icinga/Web/Form.php | 159 ++-
.../Web/Form/Decorator/FormNotifications.php | 95 ++
library/Icinga/Web/Form/ErrorLabeller.php | 2 +-
.../Web/Form/Validator/DateTimeValidator.php | 3 +-
library/Icinga/Web/Menu.php | 84 +-
.../Icinga/Web/Menu/ForeignMenuItemRenderer.php | 16 +-
library/Icinga/Web/Menu/MenuItemRenderer.php | 103 +-
.../Icinga/Web/Menu/ProblemMenuItemRenderer.php | 62 +-
library/Icinga/Web/MenuRenderer.php | 25 +-
.../Icinga/Web/Paginator/Adapter/QueryAdapter.php | 59 +-
library/Icinga/Web/Session/PhpSession.php | 2 +-
library/Icinga/Web/Session/SessionNamespace.php | 2 +-
library/Icinga/Web/StyleSheet.php | 5 +-
library/Icinga/Web/Url.php | 16 +-
library/Icinga/Web/UrlParams.php | 81 +-
library/Icinga/Web/View.php | 2 +-
library/Icinga/Web/View/DateTimeRenderer.php | 204 ----
library/Icinga/Web/View/helpers/format.php | 73 +-
library/Icinga/Web/View/helpers/url.php | 5 +
.../Icinga/Web/Widget/Chart/HistoryColorGrid.php | 11 +-
library/Icinga/Web/Widget/Chart/InlinePie.php | 56 +
library/Icinga/Web/Widget/Dashboard.php | 6 +-
library/Icinga/Web/Widget/Dashboard/Dashlet.php | 2 +-
library/Icinga/Web/Widget/Dashboard/Pane.php | 4 +-
library/Icinga/Web/Widget/FilterEditor.php | 116 +-
library/Icinga/Web/Widget/Limiter.php | 10 +-
library/Icinga/Web/Widget/Paginator.php | 168 +++
library/Icinga/Web/Widget/SortBox.php | 157 +--
library/Icinga/Web/Widget/Tab.php | 19 +-
.../Web/Widget/Tabextension/DashboardAction.php | 2 +-
.../Web/Widget/Tabextension/DashboardSettings.php | 2 +-
.../Web/Widget/Tabextension/OutputFormat.php | 7 +-
library/Icinga/Web/Widget/Tabs.php | 19 +-
library/Icinga/Web/Wizard.php | 10 +-
.../application/views/scripts/index/index.phtml | 3 +-
.../application/views/scripts/search/index.phtml | 8 +-
.../application/views/scripts/style/guide.phtml | 38 +-
modules/doc/configuration.php | 4 +-
modules/doc/library/Doc/DocController.php | 4 +-
modules/doc/module.info | 2 +-
modules/doc/run.php | 1 -
.../application/clicommands/ConferenceCommand.php | 2 +-
.../application/clicommands/ListCommand.php | 16 +-
.../application/clicommands/NrpeCommand.php | 4 +-
.../controllers/AlertsummaryController.php | 118 +-
.../application/controllers/ChartController.php | 81 +-
.../application/controllers/CommentController.php | 100 ++
.../application/controllers/CommentsController.php | 102 ++
.../application/controllers/ConfigController.php | 4 +-
.../application/controllers/DowntimeController.php | 139 +++
.../controllers/DowntimesController.php | 130 +++
.../application/controllers/HostController.php | 63 +-
.../application/controllers/HostsController.php | 181 ++--
.../application/controllers/ListController.php | 452 ++++----
.../application/controllers/ProcessController.php | 5 +-
.../application/controllers/ServiceController.php | 39 +-
.../application/controllers/ServicesController.php | 232 ++--
.../application/controllers/ShowController.php | 191 +---
.../application/controllers/TacticalController.php | 12 +-
.../application/controllers/TimelineController.php | 25 +-
.../Instance/ToggleInstanceFeaturesCommandForm.php | 67 +-
.../forms/Command/Object/CheckNowCommandForm.php | 2 +-
.../Command/Object/DeleteCommentCommandForm.php | 52 +-
.../Command/Object/DeleteCommentsCommandForm.php | 88 ++
.../Command/Object/DeleteDowntimeCommandForm.php | 61 +-
...mandForm.php => DeleteDowntimesCommandForm.php} | 68 +-
.../Object/SendCustomNotificationCommandForm.php | 47 +-
.../Object/ToggleObjectFeaturesCommandForm.php | 37 +-
.../application/forms/Config/BackendConfigForm.php | 63 ++
.../forms/Config/Instance/RemoteInstanceForm.php | 115 +-
.../forms/Config/InstanceConfigForm.php | 7 +-
.../application/forms/Setup/IdoResourcePage.php | 31 +-
.../application/views/helpers/CheckPerformance.php | 2 +-
.../application/views/helpers/Customvar.php | 12 +-
.../application/views/helpers/HostFlags.php | 39 +
.../application/views/helpers/IconImage.php | 64 ++
.../monitoring/application/views/helpers/Link.php | 6 +-
.../application/views/helpers/Perfdata.php | 109 +-
.../application/views/helpers/RuntimeVariables.php | 2 +-
.../application/views/helpers/SelectionToolbar.php | 24 -
.../application/views/helpers/ServiceFlags.php | 40 +
.../views/scripts/alertsummary/index.phtml | 17 +-
.../application/views/scripts/comment/remove.phtml | 11 +
.../application/views/scripts/comment/show.phtml | 81 ++
.../views/scripts/comments/delete-all.phtml | 12 +
.../application/views/scripts/comments/show.phtml | 25 +
.../views/scripts/downtime/remove.phtml | 11 +
.../application/views/scripts/downtime/show.phtml | 121 +++
.../views/scripts/downtimes/delete-all.phtml | 12 +
.../application/views/scripts/downtimes/show.phtml | 24 +
.../views/scripts/{show => host}/history.phtml | 56 +-
.../application/views/scripts/host/services.phtml | 18 +
.../application/views/scripts/host/show.phtml | 19 +-
.../application/views/scripts/hosts/show.phtml | 281 +++--
.../application/views/scripts/list/comments.phtml | 111 +-
.../scripts/list/components/hostssummary.phtml | 93 +-
.../scripts/list/components/servicesummary.phtml | 84 +-
.../views/scripts/list/contactgroups.phtml | 21 +-
.../application/views/scripts/list/contacts.phtml | 29 +-
.../application/views/scripts/list/downtimes.phtml | 133 ++-
.../application/views/scripts/list/eventgrid.phtml | 33 +-
.../views/scripts/list/eventhistory.phtml | 53 +-
.../views/scripts/list/hostgroups.phtml | 317 ++++--
.../application/views/scripts/list/hosts.phtml | 91 +-
.../views/scripts/list/notifications.phtml | 48 +-
.../views/scripts/list/servicegrid.phtml | 26 +-
.../views/scripts/list/servicegroups.phtml | 76 +-
.../application/views/scripts/list/services.phtml | 133 +--
.../partials/command/objects-command-form.phtml | 28 +-
.../partials/comment/comment-description.phtml | 27 +
.../scripts/partials/comment/comment-detail.phtml | 17 +
.../scripts/partials/comment/comment-header.phtml | 10 +
.../scripts/partials/comment/comments-header.phtml | 32 +
.../partials/downtime/downtime-header.phtml | 58 +
.../partials/downtime/downtimes-header.phtml | 85 ++
.../scripts/partials/host/object-header.phtml | 9 +-
.../scripts/partials/host/objects-header.phtml | 59 +-
.../scripts/partials/host/servicesummary.phtml | 142 +--
.../scripts/partials/service/object-header.phtml | 18 +-
.../scripts/partials/service/objects-header.phtml | 72 +-
.../scripts/process/disable-notifications.phtml | 4 +-
.../application/views/scripts/process/info.phtml | 31 +-
.../views/scripts/process/not-running.phtml | 4 +-
.../views/scripts/process/performance.phtml | 5 +-
.../views/scripts/{show => service}/history.phtml | 84 +-
.../application/views/scripts/service/show.phtml | 19 +-
.../application/views/scripts/services/show.phtml | 272 +++--
.../views/scripts/show/components/actions.phtml | 39 +-
.../scripts/show/components/checkstatistics.phtml | 9 +-
.../views/scripts/show/components/comments.phtml | 141 ++-
.../views/scripts/show/components/contacts.phtml | 10 +-
.../views/scripts/show/components/customvars.phtml | 6 +
.../views/scripts/show/components/downtime.phtml | 151 ++-
.../views/scripts/show/components/hostgroups.phtml | 5 +-
.../views/scripts/show/components/notes.phtml | 26 +
.../scripts/show/components/notifications.phtml | 119 +-
.../views/scripts/show/components/output.phtml | 2 +-
.../views/scripts/show/components/perfdata.phtml | 12 +-
.../scripts/show/components/servicegroups.phtml | 5 +-
.../application/views/scripts/show/contact.phtml | 11 +-
.../application/views/scripts/show/services.phtml | 5 -
.../application/views/scripts/timeline/index.phtml | 15 +-
modules/monitoring/configuration.php | 18 +-
modules/monitoring/doc/configuration.md | 16 +
modules/monitoring/doc/instances.md | 20 +-
modules/monitoring/doc/security.md | 56 +
.../Monitoring/Backend/Ido/Query/CommentQuery.php | 140 ++-
.../Ido/Query/CommentdeletionhistoryQuery.php | 164 ++-
.../Backend/Ido/Query/CommenthistoryQuery.php | 164 ++-
.../Monitoring/Backend/Ido/Query/ContactQuery.php | 152 ++-
.../Backend/Ido/Query/ContactgroupQuery.php | 175 ++-
.../Backend/Ido/Query/CustomvarQuery.php | 12 +-
.../Monitoring/Backend/Ido/Query/DowntimeQuery.php | 166 ++-
.../Backend/Ido/Query/DowntimeendhistoryQuery.php | 168 ++-
.../Ido/Query/DowntimestarthistoryQuery.php | 168 ++-
.../Backend/Ido/Query/EventHistoryQuery.php | 190 ----
.../Backend/Ido/Query/EventgridQuery.php | 114 +-
.../Backend/Ido/Query/EventhistoryQuery.php | 111 ++
.../Backend/Ido/Query/GroupsummaryQuery.php | 108 +-
.../Backend/Ido/Query/HostcommentQuery.php | 173 +++
.../Ido/Query/HostcommentdeletionhistoryQuery.php | 41 +
.../Backend/Ido/Query/HostcommenthistoryQuery.php | 167 +++
.../Backend/Ido/Query/HostdowntimeQuery.php | 179 +++
.../Ido/Query/HostdowntimeendhistoryQuery.php | 39 +
.../Ido/Query/HostdowntimestarthistoryQuery.php | 176 +++
.../Backend/Ido/Query/HostgroupQuery.php | 119 +-
.../Backend/Ido/Query/HostgroupsummaryQuery.php | 144 +++
.../Backend/Ido/Query/HostnotificationQuery.php | 257 +++++
.../Backend/Ido/Query/HoststatehistoryQuery.php | 183 ++++
.../Backend/Ido/Query/HoststatusQuery.php | 539 +++++----
.../Backend/Ido/Query/HoststatussummaryQuery.php | 75 ++
.../Monitoring/Backend/Ido/Query/IdoQuery.php | 464 +++++++-
.../Backend/Ido/Query/NotificationQuery.php | 207 ++--
.../Backend/Ido/Query/NotificationhistoryQuery.php | 32 +-
.../Backend/Ido/Query/ProgramstatusQuery.php | 14 +
.../Backend/Ido/Query/ServicecommentQuery.php | 195 ++++
.../Query/ServicecommentdeletionhistoryQuery.php | 41 +
.../Ido/Query/ServicecommenthistoryQuery.php | 166 +++
.../Backend/Ido/Query/ServicedowntimeQuery.php | 202 ++++
.../Ido/Query/ServicedowntimeendhistoryQuery.php | 39 +
.../Ido/Query/ServicedowntimestarthistoryQuery.php | 175 +++
.../Backend/Ido/Query/ServicegroupQuery.php | 112 +-
.../Backend/Ido/Query/ServicegroupsummaryQuery.php | 136 +++
.../Backend/Ido/Query/ServicenotificationQuery.php | 260 +++++
.../Backend/Ido/Query/ServicestatehistoryQuery.php | 182 ++++
.../Backend/Ido/Query/ServicestatusQuery.php | 367 +++++++
.../Ido/Query/ServicestatussummaryQuery.php | 87 ++
.../Backend/Ido/Query/StatehistoryQuery.php | 173 ++-
.../Monitoring/Backend/Ido/Query/StatusQuery.php | 41 +-
...atusSummaryQuery.php => StatussummaryQuery.php} | 224 ++--
.../Monitoring/Backend/MonitoringBackend.php | 27 +-
.../Command/Object/DeleteCommentCommand.php | 43 +-
.../Command/Object/DeleteDowntimeCommand.php | 40 +-
.../Command/Object/ScheduleServiceCheckCommand.php | 8 +-
.../Object/SendCustomNotificationCommand.php | 30 +-
.../Renderer/IcingaCommandFileCommandRenderer.php | 14 +-
.../Command/Transport/CommandTransport.php | 6 +-
.../Command/Transport/LocalCommandFile.php | 15 +-
.../Command/Transport/RemoteCommandFile.php | 71 +-
.../monitoring/library/Monitoring/Controller.php | 55 +-
.../library/Monitoring/DataView/Comment.php | 48 +-
.../library/Monitoring/DataView/Contact.php | 55 +-
.../library/Monitoring/DataView/Contactgroup.php | 63 +-
.../library/Monitoring/DataView/Customvar.php | 11 +-
.../library/Monitoring/DataView/DataView.php | 147 ++-
.../library/Monitoring/DataView/Downtime.php | 65 +-
.../library/Monitoring/DataView/Eventgrid.php | 35 +-
.../{EventHistory.php => Eventhistory.php} | 30 +-
.../library/Monitoring/DataView/Groupsummary.php | 61 --
.../library/Monitoring/DataView/Hostcomment.php | 56 +
.../library/Monitoring/DataView/Hostdowntime.php | 61 ++
.../library/Monitoring/DataView/Hostgroup.php | 39 +-
.../Monitoring/DataView/Hostgroupsummary.php | 112 ++
.../DataView/{HostStatus.php => Hoststatus.php} | 46 +-
.../Monitoring/DataView/Hoststatussummary.php | 53 +
.../library/Monitoring/DataView/Notification.php | 60 +-
.../library/Monitoring/DataView/Servicecomment.php | 59 +
.../Monitoring/DataView/Servicedowntime.php | 61 ++
.../library/Monitoring/DataView/Servicegroup.php | 41 +-
.../Monitoring/DataView/Servicegroupsummary.php | 100 ++
.../{ServiceStatus.php => Servicestatus.php} | 34 +-
.../Monitoring/DataView/Servicestatussummary.php | 58 +
.../{StatusSummary.php => Statussummary.php} | 27 +
.../monitoring/library/Monitoring/Object/Host.php | 25 +-
.../library/Monitoring/Object/HostList.php | 104 +-
.../Monitoring/Object/Macro.php} | 33 +-
.../library/Monitoring/Object/MonitoredObject.php | 122 ++-
.../library/Monitoring/Object/ObjectList.php | 161 ++-
.../library/Monitoring/Object/Service.php | 21 +-
.../library/Monitoring/Object/ServiceList.php | 152 ++-
.../library/Monitoring/Plugin/Perfdata.php | 63 +-
.../library/Monitoring/Plugin/PerfdataSet.php | 2 +-
.../Web/Controller/MonitoredObjectController.php | 59 +-
.../Monitoring/Web/Hook/ServiceActionsHook.php | 46 +
.../Menu/BackendAvailabilityMenuItemRenderer.php | 62 ++
.../Web/Menu/MonitoringMenuItemRenderer.php | 68 +-
.../Web/Menu/ProblemMenuItemRenderer.php | 2 +-
.../Web/Menu/UnhandledHostMenuItemRenderer.php | 4 +-
.../Web/Menu/UnhandledServiceMenuItemRenderer.php | 4 +-
modules/monitoring/module.info | 2 +-
modules/monitoring/public/css/module.less | 1146 +++++++++++++++++++-
modules/monitoring/public/js/module.js | 3 +-
.../views/helpers/ResolveMacrosTest.php | 78 --
.../php/library/Monitoring/Object/MacroTest.php | 78 ++
.../application/clicommands/ConfigCommand.php | 8 +-
.../application/controllers/IndexController.php | 4 +-
.../setup/application/forms/AdminAccountPage.php | 23 +-
.../setup/application/forms/AuthBackendPage.php | 10 +-
.../application/forms/DatabaseCreationPage.php | 6 +-
.../application/forms/LdapDiscoveryConfirmPage.php | 2 +-
.../setup/application/forms/RequirementsPage.php | 2 +-
modules/setup/application/forms/SummaryPage.php | 2 +-
.../views/scripts/form/setup-welcome.phtml | 39 +
.../library/Setup/Steps/AuthenticationStep.php | 13 +-
modules/setup/library/Setup/Utils/DbTool.php | 39 +-
modules/setup/library/Setup/WebWizard.php | 34 +-
modules/setup/module.info | 6 +
.../test/application/clicommands/PhpCommand.php | 6 +-
modules/test/module.info | 2 +-
modules/translation/module.info | 4 +-
public/css/icinga/controls.less | 21 +
public/css/icinga/defaults.less | 103 +-
public/css/icinga/footer-elements.less | 50 +
public/css/icinga/forms.less | 48 +-
public/css/icinga/header-elements.less | 7 -
public/css/icinga/layout-structure.less | 50 +-
public/css/icinga/login.less | 1 +
public/css/icinga/main-content.less | 312 ++++--
public/css/icinga/monitoring-colors.less | 924 ----------------
public/css/icinga/setup.less | 1 +
public/css/icinga/tabs.less | 21 +-
public/css/icinga/widgets.less | 73 +-
public/js/icinga/behavior/tooltip.js | 26 +-
public/js/icinga/events.js | 27 +-
public/js/icinga/loader.js | 12 +-
public/js/icinga/ui.js | 127 ++-
.../forms/Config/Resource/LdapResourceFormTest.php | 6 +-
.../DbBackendFormTest.php | 24 +-
.../LdapBackendFormTest.php | 40 +-
...FormTest.php => UserBackendReorderFormTest.php} | 16 +-
test/php/library/Icinga/Data/ConfigObjectTest.php | 13 +-
test/php/library/Icinga/Data/Filter/FilterTest.php | 57 +-
test/php/library/Icinga/File/Ini/IniWriterTest.php | 50 +-
.../Icinga/Protocol/Ldap/ConnectionTest.php | 258 -----
.../php/library/Icinga/Protocol/Ldap/QueryTest.php | 63 +-
test/php/library/Icinga/UserTest.php | 8 +-
.../library/Icinga/Util/DateTimeFactoryTest.php | 69 --
.../Icinga/Web/View/DateTimeRendererTest.php | 101 --
458 files changed, 27137 insertions(+), 8690 deletions(-)
diff --cc debian/changelog
index 626aa5b,d7abf5f..dfe6658
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
- icingaweb2 (2.0.0~beta3-1~debmon80+1) debmon-jessie; urgency=medium
++icingaweb2 (2.0.0~rc1-1~debmon80+1) debmon-jessie; urgency=medium
+
+ * Rebuild for debmon
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 19 Mar 2015 21:20:19 +0100
+
+ icingaweb2 (2.0.0~rc1-1) unstable; urgency=medium
+
+ * [0ef8c38] Imported Upstream version 2.0.0~rc1
+
+ -- Alexander Wirt <formorer at debian.org> Fri, 19 Jun 2015 20:37:23 +0200
+
icingaweb2 (2.0.0~beta3-1) unstable; urgency=low
[ Markus Frosch ]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icingaweb2.git
More information about the Pkg-nagios-changes
mailing list