Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #13

Merged
merged 223 commits into from
Sep 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
223 commits
Select commit Hold shift + click to select a range
5ee7dbb
* fix style configObject command
loiclau Jul 11, 2017
f58e96c
* fix style configNagios
loiclau Jul 11, 2017
51e3857
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Jul 11, 2017
8350368
Improve CLAPI documentation (#5329)
mariegallardo Jul 11, 2017
dd2a8c5
Merge branch 'master' of https://github.com/centreon/centreon
kduret Jul 11, 2017
da6d052
* fix style escalation
loiclau Jul 11, 2017
9efcb5c
It is better to get MAX(traps_id) before use it (#5415)
lpinsivy Jul 12, 2017
048f343
broker directory no longer existe - issue #5399 (#5416)
lpinsivy Jul 12, 2017
d5a5fe2
Feature ACLActionAccess created (#5432)
mariegallardo Jul 12, 2017
1dbc720
Fix filter on HG / CG export
kduret Jul 12, 2017
e600f81
Do not list meta service to link to a SNMP trap - issue #5418 (#5419)
lpinsivy Jul 12, 2017
61ed9a0
Fix log debug path (#5431)
Jul 12, 2017
92cfb9c
typo correction in data management (#5440)
cgagnaire Jul 12, 2017
b261fb5
enhance configuration handling (#5439)
cgagnaire Jul 12, 2017
e46916f
AutologinOptions feature created (#5437)
mariegallardo Jul 12, 2017
ff3db10
[Load views] Fixed database entry duplication (#5260)
Jul 12, 2017
168caf1
New Feature ACLResourcesAccess (#5422)
mariegallardo Jul 12, 2017
0720b4c
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Jul 12, 2017
fb21013
* add new argument in install partition config
loiclau Jul 13, 2017
c5e26b8
Acl access groups (#5404)
MatthieuMan Jul 13, 2017
5be7bef
ContactGroupConfiguration added (#5372)
mariegallardo Jul 13, 2017
f3a350c
* fix pear in centreon-partition
loiclau Jul 13, 2017
f36032e
* fix style
loiclau Jul 13, 2017
96a68ff
* fix pear in recurrentDowntime
loiclau Jul 13, 2017
3721512
* fix style
loiclau Jul 13, 2017
0809761
* fix style
loiclau Jul 13, 2017
ad3c2a8
* fix style
loiclau Jul 13, 2017
e891cc1
* fix style
loiclau Jul 13, 2017
c07c6ac
* fix custom view duplication with user group
loiclau Jul 17, 2017
176e267
Clapi service category (#5447)
MatthieuMan Jul 17, 2017
5a82cb4
setservice and setservicetemplate added
mariegallardo Jul 12, 2017
dfa32f3
+ Enhance partitioning table status check (#5430)
Jul 18, 2017
90168aa
* fix custom view
loiclau Jul 18, 2017
5623153
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Jul 18, 2017
654808b
* xmo replace mysql_real_escape_string by PDO::quote
loiclau Jul 18, 2017
821d3ef
* fix style meta service
loiclau Jul 18, 2017
46006ac
Lpinsivy traps whyadmin (#5417)
lpinsivy Jul 18, 2017
e7841fe
Feature created (#5445)
mariegallardo Jul 19, 2017
c8887d3
* fix pdo quote
loiclau Jul 19, 2017
2c15b13
* fix style
loiclau Jul 19, 2017
7c3ee13
* restore time range exceptions
loiclau Jul 19, 2017
71dd74e
* fix kb pagination
loiclau Jul 19, 2017
192b0f4
* fix style servicegroup
loiclau Jul 19, 2017
fe31056
* fix style service categories
loiclau Jul 19, 2017
3e0af45
* fix style tests
loiclau Jul 19, 2017
904240e
* fix style main
loiclau Jul 19, 2017
cc6cdf9
* fix style index api
loiclau Jul 19, 2017
0477f5a
* fix style api class
loiclau Jul 19, 2017
9041a76
* fix style class
loiclau Jul 19, 2017
134503f
* fix style widget params
loiclau Jul 19, 2017
ed97d79
* fix service dependency
loiclau Jul 19, 2017
62c60b4
* fix style action acl
loiclau Jul 19, 2017
c98a415
* fix style group acl
loiclau Jul 19, 2017
8ba559f
* fix style acl menu
loiclau Jul 19, 2017
3df6795
TrapSnmpConfigurationTestCreated (#5398)
mariegallardo Jul 20, 2017
86753de
avoid external command shell injection in comment
kduret Jul 20, 2017
a2eb2ba
#5453 Fix hg setparam with geo coords
kduret Jul 20, 2017
ca02f15
Add Debian 9 to unittest and package steps in Jenkinsfile.
Jul 20, 2017
b4018ab
fix clapi import of module objects
kduret Jul 20, 2017
6039070
* check space
loiclau Jul 20, 2017
fd2bf86
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Jul 20, 2017
f30c6ff
fix clapi export filter
kduret Jul 20, 2017
ea93324
fix clapi ldap contact import
kduret Jul 20, 2017
094a7f1
Update release note Centreon web 2.8.10
lpinsivy Jul 24, 2017
73420ee
Update release note Centreon web 2.8.10
lpinsivy Jul 24, 2017
52267a3
Update index to add 2.8.10
lpinsivy Jul 24, 2017
024b1d3
Add 2.8.11 update script.
Jul 24, 2017
e3b805d
Insert 2.8.11 in SQL update path.
Jul 24, 2017
10ce6c2
Enhancement for deletion status and adding servicegroups and hostgrou…
Jul 24, 2017
12a7cfb
New Feature MassiveChangeHost (#5452)
mariegallardo Jul 24, 2017
30856f8
Add how to translate Centreon Web interface in documentation
lpinsivy Jul 24, 2017
fffc006
* new clapi query set param img
loiclau Jul 25, 2017
60b50e1
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Jul 25, 2017
35c97ad
CLAPI - Host - Save changes in logs (#5442)
Jul 25, 2017
d50629e
New feature HostCategoryConfiguration (#5460)
mariegallardo Jul 25, 2017
7cd65b6
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Jul 25, 2017
bed7d5e
* add clapi acl menu read only option / update grant option #5281
loiclau Jul 25, 2017
33d6d06
* fix bindParam not set
loiclau Jul 25, 2017
43411b0
* fix style myAccount
loiclau Jul 25, 2017
c28f0e1
* fix style contact template
loiclau Jul 25, 2017
0673729
New Feature created: MassiveChangeServices (#5457)
mariegallardo Jul 25, 2017
57b5360
Grant and Setcontact fixed (#5466)
mariegallardo Jul 26, 2017
cfe4634
* fix category severity select
loiclau Jul 26, 2017
0724cfe
File fixed (#5470)
mariegallardo Jul 27, 2017
5c29c93
+ Fix double command export with CLAPI (#5462)
Jul 27, 2017
9d1b268
LimitMetricInChart acceptance test updated (#5471)
MatthieuMan Jul 27, 2017
47958be
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Jul 27, 2017
81621ef
Virtual metric (#5469)
MatthieuMan Jul 27, 2017
0b4a033
MassiveChangeHost notify_on_none fixed (#5473)
mariegallardo Jul 27, 2017
307dd81
Bug Postman fixed
mariegallardo Jul 27, 2017
28f544e
Manage Timezone name with clapi(#5475)
Guillaume28 Jul 27, 2017
11266d2
fix coding style in centreonsettings class
kduret Jul 27, 2017
5371216
* fix style host dependency
loiclau Jul 27, 2017
4e2df59
* fix style hostgroup
loiclau Jul 27, 2017
a06c10a
* fix style hostgroup dependency
loiclau Jul 27, 2017
c3ed57f
Test FeatureHostConfiguration upgraded (#5465)
mariegallardo Jul 28, 2017
fbf876e
* fix style host categories
loiclau Jul 28, 2017
fd5150e
* fix style host template
loiclau Jul 28, 2017
323f8a9
Feature created (#5467)
mariegallardo Jul 28, 2017
4975281
* fix style meta service dependency
loiclau Jul 28, 2017
15c0b2d
* fix style service template model
loiclau Jul 28, 2017
9f25142
* fix style servicegroup dependency
loiclau Jul 28, 2017
695b46f
* fix style timeperiod
loiclau Jul 28, 2017
c218e66
* fix style traps
loiclau Jul 28, 2017
d23df7b
* fix style traps groups
loiclau Jul 28, 2017
ed7f478
* fix style traps manufacturer
loiclau Jul 28, 2017
1c2c28e
* fix style traps mib
loiclau Jul 28, 2017
d595796
* fix style config resources
loiclau Jul 28, 2017
114bef3
* fix constant error message
loiclau Jul 31, 2017
90bfa35
fix array declaration in acceptance tests
kduret Jul 31, 2017
466f0e5
Merge pull request #5479 from s-duret/patch-16
Dacchi Aug 1, 2017
e1942ec
* add clapi ldap export
loiclau Aug 2, 2017
8e5b008
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Aug 2, 2017
edc068d
* fix acceptance
loiclau Aug 2, 2017
65723ed
fix ldap export filter
loiclau Aug 2, 2017
9623f90
fix kb acceptance tests
kduret Aug 2, 2017
5ec0a8d
Add release note for Centreon web 2.8.11
lpinsivy Aug 3, 2017
e6acb10
* clapi ldap dependency export
loiclau Aug 3, 2017
ac341a8
fix typo
lpinsivy Aug 3, 2017
1f12724
* clapi export remove first line
loiclau Aug 3, 2017
50a35b9
update slack message in jenkinsfile
kduret Aug 3, 2017
1a13f11
Merge branch 'master' of https://github.com/centreon/centreon
kduret Aug 4, 2017
5dbff83
improve coding style of jenkinsfile
kduret Aug 4, 2017
98bf37e
Feature fixed: MassiveChangeService (#5511)
mariegallardo Aug 4, 2017
53cea10
5493 - Save geo_coords on modify form (#5505)
lpinsivy Aug 4, 2017
6bf7497
#5506 add coma to separate multiple values in SQL insert request (#5507)
lpinsivy Aug 4, 2017
ace02ff
5495 duplicate contacts on meta service duplication (#5508)
lpinsivy Aug 4, 2017
b6cd03e
* duplicate contact
loiclau Aug 4, 2017
b4cd3aa
5478 - Check if category is not a severity before duplicate contacts …
lpinsivy Aug 4, 2017
4090008
#5512 add underscore on object name on duplication (#5513)
lpinsivy Aug 4, 2017
7dee7db
add version 2.7.12 to previous versions
kduret Aug 4, 2017
a83cd21
Add Centreon Web 2.7.12 release note
lpinsivy Aug 3, 2017
1411454
* #5314 remove parallelize_checks in doc
loiclau Aug 7, 2017
55976b8
* #5315 remove process_perf_data in doc
loiclau Aug 7, 2017
597aa78
* #5316 remove checks_enabled in doc
loiclau Aug 7, 2017
aaff43b
New feature HostGroupServiceConfiguration (#5488)
mariegallardo Aug 7, 2017
4fb56f8
New Feature: CommandConfiguration (#5504)
mariegallardo Aug 7, 2017
d5db6d6
New feature (#5486)
mariegallardo Aug 7, 2017
8caf059
* #5497 duplicate acl
loiclau Aug 7, 2017
7ae264c
* #5497 duplicate contactgroup acl
loiclau Aug 7, 2017
e3012b3
New Feature ServiceTemplateConfiguration (#5489)
mariegallardo Aug 7, 2017
afdec3a
New feature: ContactTemplateConfiguration (#5499)
mariegallardo Aug 7, 2017
e1e61b0
avoid check style error with namespaces
kduret Aug 8, 2017
7accfc7
New feature: ServiceCategoryConfiguration (#5492)
mariegallardo Aug 8, 2017
8aff8bf
Feature escalation configuration (#5525)
mariegallardo Aug 8, 2017
624a43e
* fix duplicate host service dependencies
loiclau Aug 8, 2017
e2000bb
New feature MetaServiceConfiguration (#5496)
mariegallardo Aug 8, 2017
d95c522
Feature updated ContactGroupConfiguration (#5501)
mariegallardo Aug 8, 2017
8e4179d
Feature enhanced: ContactConfiguration (#5498)
mariegallardo Aug 8, 2017
09ca80c
Feature service configuration (#5482)
mariegallardo Aug 8, 2017
7bd9c7b
fix search in service template select2
kduret Aug 9, 2017
2ea1a2b
fix search in trap select2
kduret Aug 9, 2017
f50df7b
Service submit result (#5485)
MatthieuMan Aug 9, 2017
1618fad
New feature HostDependencyConfiguration (#5526)
mariegallardo Aug 9, 2017
abadc53
* clean behat
loiclau Aug 9, 2017
d83344e
fix select2 for trap
kduret Aug 9, 2017
e66be4c
fix typo in servicegroup dependency form
kduret Aug 10, 2017
948d03b
Feature host group dependency (#5530)
mariegallardo Aug 10, 2017
85963dd
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Aug 10, 2017
be30043
New feature serviceGroupDependency (#5537)
mariegallardo Aug 10, 2017
d54f602
Connectors configuration (#5515)
mariegallardo Aug 10, 2017
c2d19a0
new feature VendorConfiguration (#5540)
mariegallardo Aug 11, 2017
578df44
* duplicate host dependency #5531
loiclau Aug 11, 2017
dd3e1a4
* fix style
loiclau Aug 11, 2017
c9b873b
* fix style
loiclau Aug 11, 2017
f88db7b
* fix style header
loiclau Aug 11, 2017
76e675a
* fix style login
loiclau Aug 11, 2017
69720e6
* fix style external cmd
loiclau Aug 11, 2017
8f3f535
* fix style centreon-conf
loiclau Aug 11, 2017
538536f
[FIX] ERROR: Can't find MySQL datadir (#5484)
Aug 11, 2017
68bee09
* fix style performance
loiclau Aug 11, 2017
a173052
Increase perfs on EventLogs for non admin user (#5480)
Aug 11, 2017
d2080a0
* fix style virtualmetrics
loiclau Aug 11, 2017
a29136a
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Aug 11, 2017
f43317d
avoid php warning on config generation
kduret Aug 16, 2017
417b10d
New feature MetaServiceDependencyConfiguration (#5539)
mariegallardo Aug 16, 2017
b428fe6
FirstNotificationDelay: New tests
bouda1 Aug 11, 2017
dc62abe
* add delete errors msg #5502
loiclau Aug 16, 2017
8921440
#5410 #5287 - Fix sort and order in real time services monitoring (#5…
lpinsivy Aug 16, 2017
64f308b
Feature service dependency configuration page (#5532)
mariegallardo Aug 16, 2017
ab2ab01
Update DB-Func.php
lpinsivy Aug 16, 2017
5d6c2be
#5402 - order by status then by service description (#5552)
lpinsivy Aug 17, 2017
2e39a54
* Add sql upgrade file for 2.8.12
Aug 16, 2017
0c576cc
* Add upgrade from 2.8.12 to 2.9.0
Aug 17, 2017
dbfdb90
fix syntax error in config generate
kduret Aug 17, 2017
91328d2
replacing contact_name by contact_alias (#5546)
cgagnaire Aug 17, 2017
e398bd0
#5534 - remove padding to align field with others (#5553)
lpinsivy Aug 17, 2017
3992a98
* fix style context
loiclau Aug 17, 2017
c70069c
* fix style clapi
loiclau Aug 17, 2017
eeacab5
* fix style img_gantt
loiclau Aug 17, 2017
477b471
fix rest api acceptance tests
kduret Aug 17, 2017
44cd473
Merge branch 'master' of https://github.com/centreon/centreon
kduret Aug 17, 2017
4604f2a
Feature host template configuration (#5476)
mariegallardo Aug 17, 2017
577e825
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Aug 17, 2017
7de00a9
* fix style menu
loiclau Aug 17, 2017
f0441da
* fix style service status
loiclau Aug 17, 2017
2b9179f
* fix style graph template
loiclau Aug 17, 2017
8e9590c
* fix style eventLogs
loiclau Aug 17, 2017
6ca0f51
fix rest api acceptance tests
kduret Aug 17, 2017
bd47261
* fix style install
loiclau Aug 17, 2017
b5b5764
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Aug 17, 2017
e2dbc7c
avoid php warning when default broker field value is empty
kduret Aug 18, 2017
58e7219
fix clapi require libs
kduret Aug 18, 2017
80a0405
* fix style lib html
loiclau Aug 18, 2017
cf7d8a5
Merge branch 'master' of https://github.com/centreon/centreon
loiclau Aug 18, 2017
5930fbb
update behat + improve behat.yml code style
kduret Aug 18, 2017
da7d699
fix syntax error in quickform
kduret Aug 21, 2017
fb94939
Add release note Centreon Web 2.8.12
lpinsivy Aug 23, 2017
0fe1d86
fix(jenkins): fix sent result from jenkins to github
kduret Aug 23, 2017
6b6b9d3
fix(configuration): metaservice form
kduret Aug 23, 2017
78f0830
fix(test): use ContactGroupsPage in AclAccessGroups tests.
Aug 23, 2017
15853df
Revert "fix acceptance tests (due to contact name)"
Aug 24, 2017
43ab55f
fix(documentation): use proper timeperiod exception format.
Aug 24, 2017
9176c54
fix(clapi): retrieve clapi export header
kduret Aug 24, 2017
0515efa
fix(broker): fix generation of default broker values
Aug 25, 2017
7def239
Ref #5554
Aug 23, 2017
1b3c3a3
Fix error parsing
Aug 23, 2017
e3df089
style(area/backend): fix coding style in graph class
kduret Aug 30, 2017
bf6676c
Ref #4867
Aug 23, 2017
d729bcb
Prepare Centreon Web 2.8.13 release note
lpinsivy Aug 30, 2017
0ace0cc
test(Jenkins) remove-old-ci-map
kduret Sep 1, 2017
9b781c5
docs(release notes): add 2.7.11 release notes to 2.8.x doc
kduret Aug 29, 2017
66795f4
docs(broker): explain how to authenticate Broker connections.
Aug 30, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
35 changes: 29 additions & 6 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,20 @@ try {
failedNewAll: '0'
])
}
},
'debian9': {
node {
sh 'cd /opt/centreon-build && git pull && cd -'
sh '/opt/centreon-build/jobs/web/3.5/mon-web-unittest.sh debian9'
step([
$class: 'XUnitBuilder',
thresholds: [
[$class: 'FailedThreshold', failureThreshold: '0'],
[$class: 'SkippedThreshold', failureThreshold: '0']
],
tools: [[$class: 'PHPUnitJunitHudsonTestType', pattern: 'ut.xml']]
])
}
}
if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
error('Unit tests stage failure.');
Expand All @@ -70,6 +84,12 @@ try {
sh 'cd /opt/centreon-build && git pull && cd -'
sh '/opt/centreon-build/jobs/web/3.5/mon-web-package.sh centos7'
}
},
'debian9': {
node {
sh 'cd /opt/centreon-build && git pull && cd -'
sh '/opt/centreon-build/jobs/web/3.5/mon-web-package.sh debian9'
}
}
if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
error('Package stage failure.');
Expand Down Expand Up @@ -144,14 +164,17 @@ try {
build job: 'centreon-poller-display/master', wait: false
build job: 'centreon-pp-manager/master', wait: false
build job: 'centreon-bam/master', wait: false
build job: 'centreon-map-web', wait: false
build job: 'des-mbi-bundle-centos6', wait: false
build job: 'des-mbi-bundle-centos7', wait: false
}
}
finally {
buildStatus = currentBuild.result ?: 'SUCCESS';
if ((buildStatus != 'SUCCESS') && (env.BRANCH_NAME == 'master')) {
slackSend channel: '#monitoring-metrology', message: "@channel Centreon Web build ${env.BUILD_NUMBER} of branch ${env.BRANCH_NAME} was broken by ${source.COMMITTER}. Please fix it ASAP."
} catch(e) {
if (env.BRANCH_NAME == 'master') {
slackSend channel: "#monitoring-metrology",
color: "#F30031",
message: "*FAILURE*: `CENTREON WEB` <${env.BUILD_URL}|build #${env.BUILD_NUMBER}> on branch ${env.BRANCH_NAME}\n" +
"*COMMIT*: <https://github.com/centreon/centreon/commit/${source.COMMIT}|here> by ${source.COMMITTER}\n" +
"*INFO*: ${e}"
}

currentBuild.result = 'FAILURE'
}
Loading