Michael Friedrich
Eric Lippmann
parent
642015c294
commit
08a82daea3
|
|
@ -8,10 +8,10 @@
|
|||
#
|
||||
class icinga_packages {
|
||||
yumrepo { 'icinga_packages':
|
||||
baseurl => "http://packages.icinga.org/epel/${::operatingsystemmajrelease}/snapshot/",
|
||||
baseurl => "http://packages.icinga.com/epel/${::operatingsystemmajrelease}/snapshot/",
|
||||
enabled => '1',
|
||||
gpgcheck => '1',
|
||||
gpgkey => 'http://packages.icinga.org/icinga.key',
|
||||
gpgkey => 'http://packages.icinga.com/icinga.key',
|
||||
descr => "Icinga Repository - ${::architecture}"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Icinga Web 2
|
||||
|
||||
|
||||
|
||||
|
||||
1. [About](#about)
|
||||
2. [License](#license)
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
## About
|
||||
|
||||
**Icinga Web 2** is the next generation open source monitoring web interface, framework
|
||||
and command-line interface developed by the [Icinga Project](https://www.icinga.org/), supporting Icinga 2,
|
||||
and command-line interface developed by the [Icinga Project](https://www.icinga.com/), supporting Icinga 2,
|
||||
Icinga Core and any other monitoring backend compatible with the IDO database.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Quality Assurance
|
||||
|
||||
Review and test the changes and issues for this version.
|
||||
https://dev.icinga.org/projects/icingaweb2/roadmap
|
||||
https://dev.icinga.com/projects/icingaweb2/roadmap
|
||||
|
||||
# Release Workflow
|
||||
|
||||
|
|
@ -84,6 +84,6 @@ https://github.com/Icinga/icingaweb2/releases
|
|||
|
||||
## Announcement
|
||||
|
||||
* Create a new blog post on www.icinga.org/blog
|
||||
* Create a new blog post on www.icinga.com/blog
|
||||
* Send announcement mail to icinga-announce@lists.icinga.org
|
||||
* Social media: [Twitter](https://twitter.com/icinga), [Facebook](https://www.facebook.com/icinga), [G+](http://plus.google.com/+icinga), [Xing](https://www.xing.com/communities/groups/icinga-da4b-1060043), [LinkedIn](https://www.linkedin.com/groups/Icinga-1921830/about)
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|||
|
||||
config.vm.provider :virtualbox do |vb, override|
|
||||
override.vm.box = "centos-71-x64-vbox"
|
||||
override.vm.box_url = "http://boxes.icinga.org/centos-71-x64-vbox.box"
|
||||
override.vm.box_url = "http://boxes.icinga.com/centos-71-x64-vbox.box"
|
||||
|
||||
vb.customize ["modifyvm", :id, "--memory", "1024"]
|
||||
vb.customize ["modifyvm", :id, "--cpus", "2"]
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ use Icinga\Web\Controller;
|
|||
use Icinga\Web\Session;
|
||||
|
||||
/**
|
||||
* @TODO(el): https://dev.icinga.org/issues/10646
|
||||
* @TODO(el): https://dev.icinga.com/issues/10646
|
||||
*/
|
||||
class ApplicationStateController extends Controller
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ class IndexController extends ActionController
|
|||
public function preDispatch()
|
||||
{
|
||||
if ($this->getRequest()->getActionName() !== 'welcome') {
|
||||
// @TODO(el): Avoid landing page redirects: https://dev.icinga.org/issues/9656
|
||||
// @TODO(el): Avoid landing page redirects: https://dev.icinga.com/issues/9656
|
||||
$this->redirectNow(Url::fromRequest()->setPath('dashboard'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ use Icinga\Web\Notification;
|
|||
/**
|
||||
* Manage user permissions and restrictions based on roles
|
||||
*
|
||||
* @TODO(el): Rename to RolesController: https://dev.icinga.org/issues/10015
|
||||
* @TODO(el): Rename to RolesController: https://dev.icinga.com/issues/10015
|
||||
*/
|
||||
class RoleController extends AuthBackendController
|
||||
{
|
||||
|
|
|
|||
|
|
@ -562,7 +562,7 @@ class NavigationConfigForm extends ConfigForm
|
|||
$itemType = isset($formData['type']) ? $formData['type'] : key($itemTypes);
|
||||
if ($itemType === null) {
|
||||
throw new ProgrammingError(
|
||||
'This should actually not happen. Create a bug report at dev.icinga.org'
|
||||
'This should actually not happen. Create a bug report at dev.icinga.com'
|
||||
. ' or remove this assertion if you know what you\'re doing'
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.org\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.com\n"
|
||||
"POT-Creation-Date: 2016-05-23 20:16+0300\n"
|
||||
"PO-Revision-Date: 2016-06-02 10:02+0300\n"
|
||||
"Last-Translator: Munzir Taha <munzirtaha@gmail.com>\n"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Icinga Web 2 (None)\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.org\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.com\n"
|
||||
"POT-Creation-Date: 2016-12-12 09:32+0000\n"
|
||||
"PO-Revision-Date: 2016-12-12 10:32+0100\n"
|
||||
"Language: de_DE\n"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Icinga Web 2 (None)\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.org\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.com\n"
|
||||
"POT-Creation-Date: 2015-02-11 15:47+0100\n"
|
||||
"PO-Revision-Date: 2015-02-28 01:56+0200\n"
|
||||
"Last-Translator: Mikko Peltokangas <mikko@peltokangas.org>\n"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Icinga Web 2 (None)\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.org\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.com\n"
|
||||
"POT-Creation-Date: 2014-12-03 09:11-0200\n"
|
||||
"PO-Revision-Date: 2014-12-03 09:19-0300\n"
|
||||
"Last-Translator: Carlos Cesario <carloscesario@gmail.com>\n"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<span>© 2013-<?= date('Y') ?></span>
|
||||
<?= $this->qlink(
|
||||
$this->translate('The Icinga Project'),
|
||||
'https://www.icinga.org',
|
||||
'https://www.icinga.com',
|
||||
null,
|
||||
array(
|
||||
'target' => '_blank'
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
<div class="about-links">
|
||||
<?= $this->qlink(
|
||||
null,
|
||||
'https://dev.icinga.org/projects/icingaweb2',
|
||||
'https://dev.icinga.com/projects/icingaweb2',
|
||||
null,
|
||||
array(
|
||||
'target' => '_blank',
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
) ?>
|
||||
<?= $this->qlink(
|
||||
null,
|
||||
'https://www.icinga.org/services/support',
|
||||
'https://www.icinga.com/services/support',
|
||||
null,
|
||||
array(
|
||||
'target' => '_blank',
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
) ?>
|
||||
<?= $this->qlink(
|
||||
null,
|
||||
'https://wiki.icinga.org',
|
||||
'https://wiki.icinga.com',
|
||||
null,
|
||||
array(
|
||||
'target' => '_blank',
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
) ?>
|
||||
<?= $this->qlink(
|
||||
null,
|
||||
'https://docs.icinga.org/',
|
||||
'https://docs.icinga.com/',
|
||||
null,
|
||||
array(
|
||||
'target' => '_blank',
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
. 'authentication method. Please define a authentication method by following the instructions in the'
|
||||
. ' %1$sdocumentation%3$s or by using our %2$sweb-based setup-wizard%3$s.'
|
||||
),
|
||||
'<a href="http://docs.icinga.org/" title="' . $this->translate('Icinga Web 2 Documentation') . '">', // TODO: More exact documentation link
|
||||
'<a href="http://docs.icinga.com/" title="' . $this->translate('Icinga Web 2 Documentation') . '">', // TODO: More exact documentation link
|
||||
'<a href="' . $this->href('setup') . '" title="' . $this->translate('Icinga Web 2 Setup-Wizard') . '">',
|
||||
'</a>'
|
||||
) ?></p>
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
<?= $this->form ?>
|
||||
<div id="login-footer">
|
||||
<p>Icinga Web 2 © 2013-<?= date('Y') ?></p>
|
||||
<?= $this->qlink($this->translate('The Icinga Project'), 'https://www.icinga.org') ?>
|
||||
<?= $this->qlink($this->translate('The Icinga Project'), 'https://www.icinga.com') ?>
|
||||
<?= $this->qlink(
|
||||
null,
|
||||
'http://www.twitter.com/icinga',
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env python
|
||||
# Icinga 2
|
||||
# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
|
||||
# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.com/)
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
|
|
@ -21,7 +21,7 @@ from argparse import ArgumentParser
|
|||
|
||||
DESCRIPTION="update release changes"
|
||||
VERSION="1.0.0"
|
||||
ISSUE_URL= "https://dev.icinga.org/issues/"
|
||||
ISSUE_URL= "https://dev.icinga.com/issues/"
|
||||
ISSUE_PROJECT="icingaweb2"
|
||||
|
||||
arg_parser = ArgumentParser(description= "%s (Version: %s)" % (DESCRIPTION, VERSION))
|
||||
|
|
@ -76,7 +76,7 @@ version_name = args.version
|
|||
if args.project:
|
||||
ISSUE_PROJECT=args.project
|
||||
|
||||
rsp = urllib2.urlopen("https://dev.icinga.org/projects/%s/versions.json" % (ISSUE_PROJECT))
|
||||
rsp = urllib2.urlopen("https://dev.icinga.com/projects/%s/versions.json" % (ISSUE_PROJECT))
|
||||
versions_data = json.loads(rsp.read())
|
||||
|
||||
version_id = None
|
||||
|
|
@ -119,7 +119,7 @@ category = ""
|
|||
while True:
|
||||
# We could filter using &cf_13=1, however this doesn't currently work because the custom field isn't set
|
||||
# for some of the older tickets:
|
||||
rsp = urllib2.urlopen("https://dev.icinga.org/projects/%s/issues.json?offset=%d&status_id=closed&fixed_version_id=%d" % (ISSUE_PROJECT, offset, version_id))
|
||||
rsp = urllib2.urlopen("https://dev.icinga.com/projects/%s/issues.json?offset=%d&status_id=closed&fixed_version_id=%d" % (ISSUE_PROJECT, offset, version_id))
|
||||
issues_data = json.loads(rsp.read())
|
||||
issues_count = len(issues_data["issues"])
|
||||
offset = offset + issues_count
|
||||
|
|
|
|||
|
|
@ -39,11 +39,11 @@ Below is a list of official package repositories for installing Icinga Web 2 for
|
|||
|
||||
| Distribution | Repository |
|
||||
| ------------- | ---------- |
|
||||
| Debian | [Icinga Repository](http://packages.icinga.org/debian/) |
|
||||
| Ubuntu | [Icinga Repository](http://packages.icinga.org/ubuntu/) |
|
||||
| RHEL/CentOS | [Icinga Repository](http://packages.icinga.org/epel/) |
|
||||
| openSUSE | [Icinga Repository](http://packages.icinga.org/openSUSE/) |
|
||||
| SLES | [Icinga Repository](http://packages.icinga.org/SUSE/) |
|
||||
| Debian | [Icinga Repository](http://packages.icinga.com/debian/) |
|
||||
| Ubuntu | [Icinga Repository](http://packages.icinga.com/ubuntu/) |
|
||||
| RHEL/CentOS | [Icinga Repository](http://packages.icinga.com/epel/) |
|
||||
| openSUSE | [Icinga Repository](http://packages.icinga.com/openSUSE/) |
|
||||
| SLES | [Icinga Repository](http://packages.icinga.com/SUSE/) |
|
||||
| Gentoo | [Upstream](https://packages.gentoo.org/packages/www-apps/icingaweb2) |
|
||||
| FreeBSD | [Upstream](http://portsmon.freebsd.org/portoverview.py?category=net-mgmt&portname=icingaweb2) |
|
||||
| ArchLinux | [Upstream](https://aur.archlinux.org/packages/icingaweb2) |
|
||||
|
|
@ -59,8 +59,8 @@ Below is a list with **examples** for various distributions.
|
|||
|
||||
**Debian Jessie**:
|
||||
```
|
||||
wget -O - http://packages.icinga.org/icinga.key | apt-key add -
|
||||
echo 'deb http://packages.icinga.org/debian icinga-jessie main' >/etc/apt/sources.list.d/icinga.list
|
||||
wget -O - http://packages.icinga.com/icinga.key | apt-key add -
|
||||
echo 'deb http://packages.icinga.com/debian icinga-jessie main' >/etc/apt/sources.list.d/icinga.list
|
||||
apt-get update
|
||||
```
|
||||
|
||||
|
|
@ -70,8 +70,8 @@ apt-get update
|
|||
|
||||
**Ubuntu Xenial**:
|
||||
```
|
||||
wget -O - http://packages.icinga.org/icinga.key | apt-key add -
|
||||
add-apt-repository 'deb http://packages.icinga.org/ubuntu icinga-xenial main'
|
||||
wget -O - http://packages.icinga.com/icinga.key | apt-key add -
|
||||
add-apt-repository 'deb http://packages.icinga.com/ubuntu icinga-xenial main'
|
||||
apt-get update
|
||||
```
|
||||
> INFO
|
||||
|
|
@ -80,33 +80,33 @@ apt-get update
|
|||
|
||||
**RHEL and CentOS**:
|
||||
```
|
||||
rpm --import http://packages.icinga.org/icinga.key
|
||||
curl -o /etc/yum.repos.d/ICINGA-release.repo http://packages.icinga.org/epel/ICINGA-release.repo
|
||||
rpm --import http://packages.icinga.com/icinga.key
|
||||
curl -o /etc/yum.repos.d/ICINGA-release.repo http://packages.icinga.com/epel/ICINGA-release.repo
|
||||
yum makecache
|
||||
```
|
||||
|
||||
**Fedora**:
|
||||
```
|
||||
rpm --import http://packages.icinga.org/icinga.key
|
||||
curl -o /etc/yum.repos.d/ICINGA-release.repo http://packages.icinga.org/fedora/ICINGA-release.repo
|
||||
rpm --import http://packages.icinga.com/icinga.key
|
||||
curl -o /etc/yum.repos.d/ICINGA-release.repo http://packages.icinga.com/fedora/ICINGA-release.repo
|
||||
yum makecache
|
||||
```
|
||||
|
||||
**SLES 11**:
|
||||
```
|
||||
zypper ar http://packages.icinga.org/SUSE/ICINGA-release-11.repo
|
||||
zypper ar http://packages.icinga.com/SUSE/ICINGA-release-11.repo
|
||||
zypper ref
|
||||
```
|
||||
|
||||
**SLES 12**:
|
||||
```
|
||||
zypper ar http://packages.icinga.org/SUSE/ICINGA-release.repo
|
||||
zypper ar http://packages.icinga.com/SUSE/ICINGA-release.repo
|
||||
zypper ref
|
||||
```
|
||||
|
||||
**openSUSE**:
|
||||
```
|
||||
zypper ar http://packages.icinga.org/openSUSE/ICINGA-release.repo
|
||||
zypper ar http://packages.icinga.com/openSUSE/ICINGA-release.repo
|
||||
zypper ref
|
||||
```
|
||||
|
||||
|
|
@ -166,15 +166,15 @@ directly from source.
|
|||
First of all, you need to download the sources. Icinga Web 2 is available through a Git repository. You can clone this
|
||||
repository either via git or http protocol using the following URLs:
|
||||
|
||||
* git://git.icinga.org/icingaweb2.git
|
||||
* http://git.icinga.org/icingaweb2.git
|
||||
* git://git.icinga.com/icingaweb2.git
|
||||
* http://git.icinga.com/icingaweb2.git
|
||||
|
||||
There is also a browsable version available at
|
||||
[git.icinga.org](https://git.icinga.org/?p=icingaweb2.git;a=summary "Icinga Web 2 Git Repository").
|
||||
[git.icinga.com](https://git.icinga.com/?p=icingaweb2.git;a=summary "Icinga Web 2 Git Repository").
|
||||
This version also offers snapshots for easy download which you can use if you do not have git present on your system.
|
||||
|
||||
```
|
||||
git clone git://git.icinga.org/icingaweb2.git
|
||||
git clone git://git.icinga.com/icingaweb2.git
|
||||
```
|
||||
|
||||
### <a id="installing-from-source-requirements"></a> Installing Requirements from Source
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ If you experience any problems while running SELinux in enforcing mode try to re
|
|||
problem persists, it is not related to SELinux because in permissive mode SELinux will not deny anything.
|
||||
|
||||
When filing a bug report please add the following information additionally to the
|
||||
[common ones](https://www.icinga.org/icinga/faq/):
|
||||
[common ones](https://www.icinga.com/icinga/faq/):
|
||||
* Output of `semodule -l | grep -e icinga2 -e icingaweb2 -e nagios -e apache`
|
||||
* Output of `semanage boolean -l | grep icinga`
|
||||
* Output of `ps -eZ | grep httpd`
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ Release: %{revision}%{?dist}
|
|||
Summary: Icinga Web 2
|
||||
Group: Applications/System
|
||||
License: GPLv2+ and MIT and BSD
|
||||
URL: https://icinga.org
|
||||
URL: https://icinga.com
|
||||
Source0: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
|
||||
Packager: Icinga Team <info@icinga.org>
|
||||
Packager: Icinga Team <info@icinga.com>
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?amzn}
|
||||
%define php php
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@ class Auth
|
|||
*/
|
||||
public function persistCurrentUser()
|
||||
{
|
||||
// @TODO(el): https://dev.icinga.org/issues/10646
|
||||
// @TODO(el): https://dev.icinga.com/issues/10646
|
||||
$params = session_get_cookie_params();
|
||||
setcookie(
|
||||
'icingaweb2-session',
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ namespace Icinga\Protocol\Ldap;
|
|||
/**
|
||||
* This class provides useful LDAP-related functions
|
||||
*
|
||||
* @copyright Copyright (c) 2013 Icinga-Web Team <info@icinga.org>
|
||||
* @author Icinga-Web Team <info@icinga.org>
|
||||
* @copyright Copyright (c) 2013 Icinga-Web Team <info@icinga.com>
|
||||
* @author Icinga-Web Team <info@icinga.com>
|
||||
* @package Icinga\Protocol\Ldap
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ namespace Icinga\Protocol\Ldap;
|
|||
/**
|
||||
* This class represents an LDAP node object
|
||||
*
|
||||
* @copyright Copyright (c) 2013 Icinga-Web Team <info@icinga.org>
|
||||
* @author Icinga-Web Team <info@icinga.org>
|
||||
* @copyright Copyright (c) 2013 Icinga-Web Team <info@icinga.com>
|
||||
* @author Icinga-Web Team <info@icinga.com>
|
||||
* @package Icinga\Protocol\Ldap
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ use Icinga\Exception\IcingaException;
|
|||
/**
|
||||
* This class is a special node object, representing your connections root node
|
||||
*
|
||||
* @copyright Copyright (c) 2013 Icinga-Web Team <info@icinga.org>
|
||||
* @author Icinga-Web Team <info@icinga.org>
|
||||
* @copyright Copyright (c) 2013 Icinga-Web Team <info@icinga.com>
|
||||
* @author Icinga-Web Team <info@icinga.com>
|
||||
* @package Icinga\Protocol\Ldap
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
|
||||
* @package Icinga\Protocol\Ldap
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ use SplFixedArray;
|
|||
* ));
|
||||
* </code>
|
||||
*
|
||||
* @copyright Copyright (c) 2013 Icinga-Web Team <info@icinga.org>
|
||||
* @author Icinga-Web Team <info@icinga.org>
|
||||
* @copyright Copyright (c) 2013 Icinga-Web Team <info@icinga.com>
|
||||
* @author Icinga-Web Team <info@icinga.com>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
|
||||
*/
|
||||
class Connection
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ class ControllerTabCollector
|
|||
*/
|
||||
private static function createModuleConfigurationTabs($controllerName, Module $module)
|
||||
{
|
||||
// TODO(el): Only works for controllers w/o namepsace: https://dev.icinga.org/issues/4149
|
||||
// TODO(el): Only works for controllers w/o namepsace: https://dev.icinga.com/issues/4149
|
||||
$controllerDir = $module->getControllerDir();
|
||||
$name = $module->getName();
|
||||
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ use Icinga\Exception\ProgrammingError;
|
|||
* $tabs = Widget::create('tabs');
|
||||
* </code>
|
||||
*
|
||||
* @copyright Copyright (c) 2013 Icinga-Web Team <info@icinga.org>
|
||||
* @author Icinga-Web Team <info@icinga.org>
|
||||
* @copyright Copyright (c) 2013 Icinga-Web Team <info@icinga.com>
|
||||
* @author Icinga-Web Team <info@icinga.com>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
|
||||
*/
|
||||
class Widget
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ use Exception;
|
|||
* Please have a look at the available widgets in this folder to get a better
|
||||
* idea on what they should look like.
|
||||
*
|
||||
* @copyright Copyright (c) 2013 Icinga-Web Team <info@icinga.org>
|
||||
* @author Icinga-Web Team <info@icinga.org>
|
||||
* @copyright Copyright (c) 2013 Icinga-Web Team <info@icinga.com>
|
||||
* @author Icinga-Web Team <info@icinga.com>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
|
||||
*/
|
||||
abstract class AbstractWidget
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# icingaweb2-vendor-zf1
|
||||
|
||||
icingaweb2-vendor-zf1 is [Icinga Web 2](https://www.icinga.org/products/icinga-web-2/)'s fork of
|
||||
icingaweb2-vendor-zf1 is [Icinga Web 2](https://www.icinga.com/products/icinga-web-2/)'s fork of
|
||||
[Zend Framework](https://framework.zend.com/) 1 which is
|
||||
[end-of-life](https://framework.zend.com/blog/2016-06-28-zf1-eol.html) since Sep 28, 2016.
|
||||
We've reduced the library to the minimum required by Icinga Web 2 and its modules.
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Monitoring Module (2.3.2)\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.org\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.com\n"
|
||||
"POT-Creation-Date: 2016-05-25 05:05+0300\n"
|
||||
"PO-Revision-Date: 2016-06-02 10:09+0300\n"
|
||||
"Last-Translator: Munzir Taha <munzirtaha@gmail.com>\n"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Monitoring Module (2.3.4)\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.org\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.com\n"
|
||||
"POT-Creation-Date: 2016-12-12 09:32+0000\n"
|
||||
"PO-Revision-Date: 2016-12-13 12:41+0100\n"
|
||||
"Language: de_DE\n"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Monitoring Module (2.0.0)\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.org\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.com\n"
|
||||
"POT-Creation-Date: 2015-11-09 15:01+0100\n"
|
||||
"PO-Revision-Date: 2015-11-09 15:00+0100\n"
|
||||
"Last-Translator: Davide Demuru <davide.demuru@gmail.com>\n"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Monitoring Module (2.0.0~alpha4)\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.org\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.com\n"
|
||||
"POT-Creation-Date: 2014-12-03 09:10-0200\n"
|
||||
"PO-Revision-Date: 2014-12-03 09:13-0300\n"
|
||||
"Last-Translator: Carlos Cesario <carloscesario@gmail.com>\n"
|
||||
|
|
|
|||
|
|
@ -750,7 +750,7 @@ abstract class MonitoredObject implements Filterable
|
|||
* Find all occurences of http links, separated by whitespaces and quoted
|
||||
* by single or double-ticks.
|
||||
*
|
||||
* @link http://docs.icinga.org/latest/de/objectdefinitions.html
|
||||
* @link http://docs.icinga.com/latest/de/objectdefinitions.html
|
||||
*
|
||||
* @param string $urlString A string containing one or more urls
|
||||
* @return array Array of urls as strings
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ use Zend_View_Helper_PluginOutput;
|
|||
*
|
||||
* Plugin output renderer must preserve the first character after a comma.
|
||||
*
|
||||
* @see https://dev.icinga.org/issues/11728
|
||||
* @see https://dev.icinga.com/issues/11728
|
||||
*/
|
||||
class Bug11728Test extends BaseTestCase
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ use Zend_View_Helper_PluginOutput;
|
|||
*
|
||||
* Plugin output renderer must not destroy links by adding zero width space characters.
|
||||
*
|
||||
* @see https://dev.icinga.org/issues/11796
|
||||
* @see https://dev.icinga.com/issues/11796
|
||||
*/
|
||||
class Bug11796Test extends BaseTestCase
|
||||
{
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class Bug6088CommandFileCommandRenderer extends IcingaCommandFileCommandRenderer
|
|||
*
|
||||
* Multi-line comments don't work
|
||||
*
|
||||
* @see https://dev.icinga.org/issues/6088
|
||||
* @see https://dev.icinga.com/issues/6088
|
||||
*/
|
||||
class Bug6088Test extends BaseTestCase
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Setup Module (2.3.4)\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.org\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.com\n"
|
||||
"POT-Creation-Date: 2016-12-12 09:32+0000\n"
|
||||
"PO-Revision-Date: 2016-12-13 12:10+0100\n"
|
||||
"Language: de_DE\n"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Setup Module (2.1.0)\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.org\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.com\n"
|
||||
"POT-Creation-Date: 2015-11-24 23:39+0100\n"
|
||||
"PO-Revision-Date: 2015-11-24 23:38+0100\n"
|
||||
"Last-Translator: Davide Demuru <davide.demuru@gmail.com>\n"
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ if (! (false === ($distro = Platform::getLinuxDistro(1)) || $distro === 'linux')
|
|||
</div>
|
||||
<p><?= sprintf(
|
||||
$this->translate('Please see the %s for an extensive description on how to access and use this wizard.'),
|
||||
'<a href="http://docs.icinga.org/">' . $this->translate('Icinga Web 2 documentation') . '</a>' // TODO: Add link to iw2 docs which points to the installation topic
|
||||
'<a href="http://docs.icinga.com/">' . $this->translate('Icinga Web 2 documentation') . '</a>' // TODO: Add link to iw2 docs which points to the installation topic
|
||||
); ?></p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ Now you can open the __yourmodule.po__ and you will see something similar:
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Development Module (0.0.1)\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.org\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.com\n"
|
||||
"POT-Creation-Date: 2014-09-09 10:12+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
|
|
|
|||
|
|
@ -319,7 +319,7 @@ class GettextTranslationHelper
|
|||
'author_year' => 'YEAR',
|
||||
'project_name' => $this->moduleName ? ucfirst($this->moduleName) . ' Module' : 'Icinga Web 2',
|
||||
'project_version' => $this->version,
|
||||
'project_bug_mail' => 'dev@icinga.org',
|
||||
'project_bug_mail' => 'dev@icinga.com',
|
||||
'pot_creation_date' => date('Y-m-d H:iO'),
|
||||
'po_revision_date' => 'YEAR-MO-DA HO:MI+ZONE',
|
||||
'translator_name' => 'FULL NAME',
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ Navigate to `/icingaweb/setup` and follow the on-screen instructions.
|
|||
|
||||
## Support
|
||||
|
||||
Please use one of the listed support channels at https://support.icinga.org
|
||||
Please use one of the listed support channels at https://support.icinga.com
|
||||
|
||||
|
||||
## Manual Setup
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
Source: icingaweb
|
||||
Section: admin
|
||||
Maintainer: Icinga Development Team <info@icinga.org>
|
||||
Maintainer: Icinga Development Team <info@icinga.com>
|
||||
Priority: optional
|
||||
Build-Depends: debhelper (>=9)
|
||||
Standards-Version: 3.9.4
|
||||
Homepage: https://www.icinga.org
|
||||
Homepage: https://www.icinga.com
|
||||
|
||||
Package: php-icinga
|
||||
Architecture: any
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*! Icinga Web 2 | (c) 2015 Icinga Development Team | GPLv2+ */
|
||||
|
||||
// @TODO(el): https://dev.icinga.org/issues/10646
|
||||
// @TODO(el): https://dev.icinga.com/issues/10646
|
||||
(function(Icinga, $) {
|
||||
|
||||
'use strict';
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@ class ArrayDatasourceTest extends BaseTestCase
|
|||
(object) array(
|
||||
'host' => 'localhost',
|
||||
'problem' => '1',
|
||||
'service' => 'www.icinga.org',
|
||||
'service' => 'www.icinga.com',
|
||||
'state' => '0',
|
||||
'handled' => '0'
|
||||
),
|
||||
(object) array(
|
||||
'host' => 'localhost',
|
||||
'problem' => '1',
|
||||
'service' => 'www.icinga.org',
|
||||
'service' => 'www.icinga.com',
|
||||
'state' => '1',
|
||||
'handled' => '0'
|
||||
)
|
||||
|
|
|
|||
|
|
@ -75,14 +75,14 @@ class FilterTest extends BaseTestCase
|
|||
(object) array(
|
||||
'host' => 'localhost',
|
||||
'problem' => '1',
|
||||
'service' => 'www.icinga.org',
|
||||
'service' => 'www.icinga.com',
|
||||
'state' => '0',
|
||||
'handled' => '0'
|
||||
),
|
||||
(object) array(
|
||||
'host' => 'localhost',
|
||||
'problem' => '1',
|
||||
'service' => 'www.icinga.org',
|
||||
'service' => 'www.icinga.com',
|
||||
'state' => '1',
|
||||
'handled' => '0'
|
||||
)
|
||||
|
|
@ -138,7 +138,7 @@ class FilterTest extends BaseTestCase
|
|||
public function testWildcardFilterMatchesDot()
|
||||
{
|
||||
$this->assertTrue(
|
||||
Filter::where('service', 'www*icinga.org')->matches($this->row(1))
|
||||
Filter::where('service', 'www*icinga.com')->matches($this->row(1))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -169,7 +169,7 @@ class FilterTest extends BaseTestCase
|
|||
Filter::matchAny(
|
||||
Filter::where('service', 'ping'),
|
||||
Filter::matchAll(
|
||||
Filter::where('service', 'www.icinga.org'),
|
||||
Filter::where('service', 'www.icinga.com'),
|
||||
Filter::where('state', '0')
|
||||
)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ use Icinga\Test\BaseTestCase;
|
|||
*
|
||||
* Empty lines in module.info must be ignored if they're not part of the module's description
|
||||
*
|
||||
* @see https://dev.icinga.org/issues/11831
|
||||
* @see https://dev.icinga.com/issues/11831
|
||||
*/
|
||||
class Bug11831Test extends BaseTestCase
|
||||
{
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ use Icinga\Test\BaseTestCase;
|
|||
*
|
||||
* Bogus regression test
|
||||
*
|
||||
* @see https://dev.icinga.org/issues/4102
|
||||
* @see https://dev.icinga.com/issues/4102
|
||||
*/
|
||||
class Bug4102Test extends BaseTestCase
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ use Icinga\Web\Url;
|
|||
*
|
||||
* href-helper drops URL fragments.
|
||||
*
|
||||
* @see https://dev.icinga.org/issues/6284
|
||||
* @see https://dev.icinga.com/issues/6284
|
||||
*/
|
||||
class Bug6284Test extends BaseTestCase
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ use Icinga\Util\Translator;
|
|||
*
|
||||
* Translating strings must not throw an exception even if the given domain is not valid.
|
||||
*
|
||||
* @see https://dev.icinga.org/issues/6432
|
||||
* @see https://dev.icinga.com/issues/6432
|
||||
*/
|
||||
class Bug6432Test extends BaseTestCase
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Icinga Web 2 Test (0.0.1)\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.org\n"
|
||||
"Report-Msgid-Bugs-To: dev@icinga.com\n"
|
||||
"POT-Creation-Date: 2014-09-16 13:29+0200\n"
|
||||
"PO-Revision-Date: 2014-09-16 16:08+0100\n"
|
||||
"Last-Translator: Alexander Fuhr <alexander.fuhr@netways.de>\n"
|
||||
|
|
|
|||
Loading…
Reference in New Issue