Skip to content

Commit bf5bc0d

Browse files
mohierfmohierf
committed
Update default shipped configuration
1 parent fd275e1 commit bf5bc0d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+476
-433
lines changed

‎.travis.yml

+6-14
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,18 @@ jobs:
6565
install:
6666
# Install packaging requirements
6767
- echo "Installing packaging requirements..."
68-
- sudo pip install virtualenv virtualenv-tools
69-
- sudo pip install --upgrade distribute
7068
script:
7169
- echo "Deploying to BinTray packages..."
7270
# Package Alignak for debian
7371
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION deb
74-
# if: (branch IN (master, develop)) OR (tag IS present)
72+
# if: (branch IN (master, develop)) OR (tag IS present)
7573
deploy:
7674
- provider: bintray
7775
skip_cleanup: true
7876
file: dist/.bintray-deb.json
7977
on:
8078
all_branches: true
81-
# condition: $TRAVIS_BRANCH =~ ^master|develop$
79+
# condition: $TRAVIS_BRANCH =~ ^master|develop$
8280
user: mohierf
8381
key:
8482
secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="
@@ -88,17 +86,16 @@ jobs:
8886
# Install packaging requirements
8987
- echo "Installing packaging requirements..."
9088
- sudo apt-get install -y rpm
91-
- sudo pip install virtualenv virtualenv-tools
92-
- sudo pip install --upgrade distribute
9389
script:
9490
- echo "Deploying to BinTray packages..."
9591
# Package Alignak for rpm
9692
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION rpm
97-
# if: (branch IN (master, develop)) OR (tag IS present)
9893
deploy:
9994
- provider: bintray
10095
skip_cleanup: true
10196
file: dist/.bintray-rpm.json
97+
on:
98+
all_branches: true
10299
user: mohierf
103100
key:
104101
secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="
@@ -108,17 +105,16 @@ jobs:
108105
# Install packaging requirements
109106
- echo "Installing packaging requirements..."
110107
- sudo apt-get install -y rpm
111-
- sudo pip install virtualenv virtualenv-tools
112-
- sudo pip install --upgrade distribute
113108
script:
114109
- echo "Deploying to BinTray packages..."
115110
# Package Alignak for rpm
116111
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION rpm
117-
# if: (branch IN (master, develop)) OR (tag IS present)
118112
deploy:
119113
- provider: bintray
120114
skip_cleanup: true
121115
file: dist/.bintray-rpm.json
116+
on:
117+
all_branches: true
122118
user: mohierf
123119
key:
124120
secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="
@@ -127,20 +123,16 @@ jobs:
127123
install:
128124
# Install packaging requirements
129125
- echo "Installing packaging requirements..."
130-
- sudo pip install virtualenv virtualenv-tools
131-
- sudo pip install --upgrade distribute
132126
script:
133127
- echo "Deploying to BinTray packages..."
134128
# Package Alignak-backend for deb/rpm
135129
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION freebsd
136-
# if: (branch IN (master, develop)) OR (tag IS present)
137130
deploy:
138131
- provider: bintray
139132
skip_cleanup: true
140133
file: dist/.bintray-freebsd.json
141134
on:
142135
all_branches: true
143-
# tags: true
144136
user: mohierf
145137
key:
146138
secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="

‎code_test.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ if [ $? -ne 0 ]; then
3737
fi
3838

3939
echo 'tests ...'
40-
cd test
41-
pytest --verbose --durations=10 --no-print-logs --cov=alignak --cov-report term-missing --cov-config .coveragerc test_*.py || travis_terminate 1;
40+
cd tests
41+
pytest --verbose --durations=10 --no-print-logs --cov=alignak --cov-report term-missing --cov-config .coveragerc test_*.py
42+
cd ..
43+
cd tests_integ
44+
pytest --verbose --durations=10 --no-print-logs --cov=alignak --cov-report term-missing --cov-config .coveragerc test_*.py
4245
cd ..

‎etc/arbiter/modules/readme.cfg

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#
2-
# In this place you will find all the modules configuration files installed for Alignak
2+
# Here you will find all the Nagios legacy modules configuration files installed for Alignak
3+
# ---
4+
# Check if your module installer also installed an ini file in the alignak.d directory.
5+
# This is the new way of installing and dealing with modules
36
#
47

‎etc/arbiter/objects/contactgroups/admins.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
define contactgroup{
22
contactgroup_name admins
3-
alias admins
3+
alias Administrators
44
members admin
55
}
66

‎etc/arbiter/objects/contacts/admin.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ define contact{
77
alias Administrator
88
email alignak@localhost
99
pager 0600000000
10+
# Only useful for the UI...
1011
password admin
1112
is_admin 1
1213
can_submit_commands 1 ; Implicit because it is an admin

‎etc/arbiter/objects/contacts/guest.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ define contact{
66
contact_name guest
77
alias Guest
88
email guest@localhost
9+
# Only useful for the UI...
910
password guest
1011
can_submit_commands 0
1112
}

‎etc/arbiter/objects/dependencies/sample.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dependencies
22

3-
# This is the HARD way for define dependencies. Please look at the
3+
# This is the HARD way for defining dependencies. Please look at the
44
# service_dependencies property for the services instead!
55

66
#define servicedependency {

‎etc/arbiter/objects/escalations/sample.cfg

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
2-
31
# Define escalation the OLD school way.
4-
# Better use the simple "escalation" way! (in alignak-specific.cfg)
2+
# Better use the simple "escalation" way!
53

64
#define serviceescalation{
75
# host_name localhost

‎etc/arbiter/objects/hostgroups/linux.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
define hostgroup{
2-
hostgroup_name linux ; The name of the hostgroup
3-
alias Linux Servers ; Long name of the group
2+
hostgroup_name linux
3+
alias Linux Servers
44
#members
55
}

‎etc/arbiter/objects/hosts/host_0.cfg

-8
This file was deleted.

‎etc/arbiter/objects/hosts/host_1.cfg

-8
This file was deleted.

‎etc/arbiter/objects/hosts/host_2.cfg

-8
This file was deleted.

‎etc/arbiter/objects/hosts/host_3.cfg

-8
This file was deleted.

‎etc/arbiter/objects/hosts/internal_checks_hosts.cfg

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Some hosts checked with internal check commands
2+
define host{
3+
use test-host
4+
contact_groups admins
5+
host_name host_0
6+
address 127.0.0.1
7+
8+
check_command _internal_host_check!0!I am always Up
9+
}
10+
11+
define host{
12+
use test-host
13+
contact_groups admins
14+
host_name host_1
15+
address 127.0.0.1
16+
17+
check_command _internal_host_check!1!I am always Unreachable
18+
}
19+
20+
define host{
21+
use test-host
22+
contact_groups admins
23+
host_name host_2
24+
address 127.0.0.1
25+
26+
check_command _internal_host_check!2!I am always Down
27+
}
28+
29+
define host{
30+
use test-host
31+
contact_groups admins
32+
host_name host_3
33+
address 127.0.0.1
34+
35+
check_command _internal_host_check!3!I am always Unknown
36+
}
37+
38+
# An host changing randomly from Up to Down
39+
define host{
40+
use test-host
41+
contact_groups admins
42+
host_name host_11
43+
address 127.0.0.1
44+
45+
check_command _internal_host_check!0,2!I am changing for %d
46+
}

‎etc/arbiter/objects/hosts/localhost.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ define host{
22
use generic-host
33
contact_groups admins
44
host_name localhost
5-
address localhost
6-
}
7-
5+
alias Alignak server
6+
address 127.0.0.1
7+
}

‎etc/arbiter/objects/hosts/not-monitored.cfg

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
define host{
2+
use generic-host
3+
host_name not_monitored_host_[0-9-%03d]
4+
address localhost
5+
6+
realm All
7+
8+
active_checks_enabled 0
9+
passive_checks_enabled 0
10+
11+
check_command _internal_host_check!0,2!I am changing for %d
12+
}

‎etc/arbiter/objects/hosts/self_generated_hosts.cfg

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
define host{
2+
use generic-host
3+
host_name north_host_[0-19-%03d]
4+
address localhost
5+
6+
check_command _internal_host_check!0!I am always Up
7+
}

‎etc/arbiter/objects/timeperiods/24x7.cfg

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
define timeperiod{
2-
timeperiod_name 24x7
3-
alias Always
4-
sunday 00:00-24:00
5-
monday 00:00-24:00
6-
tuesday 00:00-24:00
7-
wednesday 00:00-24:00
8-
thursday 00:00-24:00
9-
friday 00:00-24:00
10-
saturday 00:00-24:00
2+
timeperiod_name 24x7
3+
alias Always
4+
5+
sunday 00:00-24:00
6+
monday 00:00-24:00
7+
tuesday 00:00-24:00
8+
wednesday 00:00-24:00
9+
thursday 00:00-24:00
10+
friday 00:00-24:00
11+
saturday 00:00-24:00
1112
}
1213

‎etc/arbiter/objects/timeperiods/none.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# 'none' timeperiod definition
22
define timeperiod{
3-
timeperiod_name none
4-
alias No Time Is A Good Time
5-
}
3+
timeperiod_name none
4+
alias No Time Is A Good Time
5+
}

‎etc/arbiter/objects/timeperiods/us-holidays.cfg

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
# treated as a valid time for notifications, etc. You probably don't want your pager
44
# going off on New Year's. Although you're employer might... :-)
55
define timeperiod{
6-
name us-holidays
7-
timeperiod_name us-holidays
8-
alias U.S. Holidays
6+
name us-holidays
7+
timeperiod_name us-holidays
8+
alias U.S. Holidays
99

10-
january 1 00:00-00:00 ; New Years
11-
monday -1 may 00:00-00:00 ; Memorial Day (last Monday in May)
12-
july 4 00:00-00:00 ; Independence Day
13-
monday 1 september 00:00-00:00 ; Labor Day (first Monday in September)
14-
thursday -1 november 00:00-00:00 ; Thanksgiving (last Thursday in November)
15-
december 25 00:00-00:00 ; Christmas
16-
}
10+
january 1 00:00-00:00 ; New Year's day
11+
monday -1 may 00:00-00:00 ; Memorial Day (last Monday in May)
12+
july 4 00:00-00:00 ; Independence Day
13+
monday 1 september 00:00-00:00 ; Labor Day (first Monday in September)
14+
thursday -1 november 00:00-00:00 ; Thanksgiving (last Thursday in November)
15+
december 25 00:00-00:00 ; Christmas
16+
}

‎etc/arbiter/objects/timeperiods/workhours.cfg

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# 'workhours' timeperiod definition
22
define timeperiod{
3-
timeperiod_name workhours
4-
alias Normal Work Hours
5-
monday 09:00-17:00
6-
tuesday 09:00-17:00
7-
wednesday 09:00-17:00
8-
thursday 09:00-17:00
9-
friday 09:00-17:00
10-
}
3+
timeperiod_name workhours
4+
alias Normal Work Hours
5+
6+
monday 09:00-17:00
7+
tuesday 09:00-17:00
8+
wednesday 09:00-17:00
9+
thursday 09:00-17:00
10+
friday 09:00-17:00
11+
}

‎etc/arbiter/packs/readme.cfg

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#
2-
# In this place you will find all the packs built and installed for Alignak
2+
# Here you will find all the Nagios legacy configuration files for the packs installed for Alignak
3+
# ---
4+
# Check if your pack installer also installed an ini file in the alignak.d directory.
5+
# This is the new way of installing and dealing with packs
36
#
4-
# You can freely adapt them to your own needs.
5-

‎etc/arbiter/packs/resource.d/readme.cfg

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
#
2-
# In this place you will find the Alignak global macros defined by the installed packs
2+
# Here you will find all the macro definitions for the packs installed for Alignak
3+
# ---
4+
# Check if your pack installer also installed an ini file in the alignak.d directory.
5+
# This is the new way of installing and dealing with packs
36
#

‎etc/arbiter/resource.d/paths.cfg

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
1+
#
2+
# Here you will find all the Nagios legacy macro definitions for for Alignak
3+
# ---
4+
# This file is maintained mainly for backwards compatibility. The macros may now be defined
5+
# in the Alignak configuration file.
6+
#
7+
18
# Nagios legacy macros
29
$USER1$=$NAGIOSPLUGINSDIR$
310
$NAGIOSPLUGINSDIR$=/usr/lib/nagios/plugins
411
# For a FreeBSD, set this value:
512
# $NAGIOSPLUGINSDIR$=/usr/local/libexec/nagios
613

7-
#-- Alignak main directories
8-
#-- Those macros are automatically updated during the Alignak installation
9-
#-- process (eg. python setup.py install)
14+
#-- Alignak daemons directories and user account
15+
#-- Theses macros overload the corresponding ones defined in the alignak.ini file
1016
$BIN$=/usr/local/bin
11-
$ETC$=/usr/local/alignak/etc
17+
$ETC$=/usr/local/etc/alignak
1218
$VAR$=/usr/local/var
1319
$RUN$=$VAR$/run
1420
$LOG$=$VAR$/log
1521

1622
$USER$=alignak
1723
$GROUP$=alignak
1824

19-
#-- Those macros are declared to be used in some templates or commands definition
25+
#-- These macros are declared to be used in some templates or commands definition
2026
$LIBEXEC$=$VAR$
2127
$PLUGINSDIR$=$VAR$

0 commit comments

Comments
 (0)