Skip to content
This repository was archived by the owner on Dec 13, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
80add3b
Adapt font regexp path for Windows (#8375)
Thebarda Feb 28, 2020
036f6f0
enh(apiv2): add event listing for hosts and services
victorvassilev Feb 28, 2020
748d8ea
enh(apiv2): add event listing for hosts and services
victorvassilev Feb 28, 2020
e793c0e
fix(doc): regenerate html for doc
victorvassilev Feb 28, 2020
915762f
Merge branch 'MON-4866-add-eventlog-listing' of https://github.com/ce…
victorvassilev Feb 28, 2020
33c0fe1
feat(ui): Implement Resources listing (#8371)
bdauria Feb 28, 2020
9e5b802
fix(tests): update error message on unit test
victorvassilev Feb 28, 2020
85a8b6c
Fix the search parameter 'IN' (#8380)
callapa Feb 28, 2020
9972d4c
fix(doc): fix scrollbar issue in API documentation (#8378)
kduret Mar 2, 2020
4245032
feat(build): stash git sources for Sonar analysis.
Mar 2, 2020
0d3c51c
feat(ui): Implement Unified view search (#8382)
bdauria Mar 3, 2020
07c7e2f
feat(build): fail build on front-end style errors.
Mar 4, 2020
40443e8
enh(doc): update docblock in interface
victorvassilev Mar 4, 2020
a3e7713
fix: fix ESLint warnings
bdauria Mar 4, 2020
f4463cb
Merge branch 'master' into MON-4789-unified-view
kduret Mar 4, 2020
fd1f005
doc(api): document how to use search parameter with API (#8376)
kduret Mar 4, 2020
4e26b51
Merge branch 'master' into MON-4789-unified-view
kduret Mar 4, 2020
fc38f12
fix(test): improve unit test SqlRequestParametersTranslatorTest::test…
vhr Mar 5, 2020
23166d1
fix(configuration): export hosts geo_coords to remote server (#8390)
cgagnaire Mar 5, 2020
83fff4a
fix(ldap): use define user member_attribute var (#8287)
cgagnaire Mar 5, 2020
3a97ce2
feat(ui): Implement Unified view downtime and acknowledge tooltips (#…
bdauria Mar 5, 2020
75128bf
fix(code): Clean switch case service monitoring (#8285)
cgagnaire Mar 5, 2020
34c6b66
fix(remote-server): fix import with strict mode (#7944)
kduret Mar 5, 2020
b143520
doc(api): document how to generate html api documentation (#8394)
kduret Mar 5, 2020
45793fa
Merge branch 'master' into MON-4789-unified-view
kduret Mar 5, 2020
a87f83a
feat(doc): update the API documentation (#8393)
vhr Mar 5, 2020
c01eb93
fix(doc): remove again api html documentation
kduret Mar 6, 2020
50ed470
Update src/Centreon/Domain/Monitoring/Entity/DowntimeEventObject.php
victorvassilev Mar 6, 2020
99987ce
Update src/Centreon/Domain/Monitoring/Interfaces/TimelineRepositoryIn…
victorvassilev Mar 6, 2020
38983b7
Update src/Centreon/Domain/Monitoring/Interfaces/EventObjectInterface…
victorvassilev Mar 6, 2020
a06651f
Update package-lock
bdauria Mar 6, 2020
f9d30ea
enh(apiv2): add event listing for hosts and services
victorvassilev Feb 28, 2020
d4397aa
fix(doc): regenerate html for doc
victorvassilev Feb 28, 2020
64b829f
fix(tests): update error message on unit test
victorvassilev Feb 28, 2020
8e07ec2
enh(doc): update docblock in interface
victorvassilev Mar 4, 2020
28a304d
Update src/Centreon/Domain/Monitoring/Entity/DowntimeEventObject.php
victorvassilev Mar 6, 2020
d981c56
Update src/Centreon/Domain/Monitoring/Interfaces/TimelineRepositoryIn…
victorvassilev Mar 6, 2020
d6ac24e
Update src/Centreon/Domain/Monitoring/Interfaces/EventObjectInterface…
victorvassilev Mar 6, 2020
c1b4cd6
resolve conflict with html doc
victorvassilev Mar 6, 2020
60cb7cf
Merge branch 'MON-4866-add-eventlog-listing' of https://github.com/ce…
victorvassilev Mar 6, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#generic development files
www/index.html

#api html documentation
doc/API/centreon-api-v2.html

#backend development and project files
.idea/
vendor/
Expand Down
8 changes: 8 additions & 0 deletions doc/API/README.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# API Documentation Guide

## How to build ?

```console
npm install -g redoc-cli
redoc-cli bundle --options.hideDownloadButton=true centreon-api-v2.yaml -o centreon-api-v2.html
```
797 changes: 0 additions & 797 deletions doc/API/centreon-api-v2.html

This file was deleted.

6 changes: 4 additions & 2 deletions src/CentreonRemote/Domain/Exporter/ConfigurationExporter.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,10 @@ public function import(ExportManifest $manifest): void
$import = $manifest->get("import");
foreach ($import['data'] as $data) {
if (!isset($truncated[$data['table']])) {
// truncate table
$db->query("TRUNCATE TABLE `" . $data['table'] . "`;");
// empty table
$db->query("DELETE FROM `" . $data['table'] . "`");
// optimize table
$db->query("OPTIMIZE TABLE `" . $data['table'] . "`");
$truncated[$data['table']] = 1;
}

Expand Down
5 changes: 3 additions & 2 deletions www/class/centreonLDAP.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -508,9 +508,10 @@ public function listUserForGroup($groupdn)
return array();
}
$entries = ldap_get_entries($this->ds, $result);
$nbEntries = !empty($entries[0]['member']['count']) ? $entries[0]['member']['count'] : 0;
$memberAttribute = $this->groupSearchInfo['member'];
$nbEntries = !empty($entries[0][$memberAttribute]['count']) ? $entries[0][$memberAttribute]['count'] : 0;
for ($i = 0; $i < $nbEntries; $i++) {
$list[] = $entries[0]['member'][$i];
$list[] = $entries[0][$memberAttribute][$i];
}
restore_error_handler();
}
Expand Down
4 changes: 3 additions & 1 deletion www/class/config-generate-remote/Abstracts/AbstractHost.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ abstract class AbstractHost extends AbstractObject
ehi_2d_coords,
ehi_3d_coords,
host_location,
host_acknowledgement_timeout
host_acknowledgement_timeout,
geo_coords
';

protected $attributesWrite = [
Expand Down Expand Up @@ -98,6 +99,7 @@ abstract class AbstractHost extends AbstractObject
'host_register',
'host_location',
'host_acknowledgement_timeout',
'geo_coords'
];

protected $loopHtpl = []; // To be reset
Expand Down
34 changes: 0 additions & 34 deletions www/include/monitoring/status/monitoringService.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,35 +111,19 @@
$svc_path = $path . "Services/";
$hg_path = $path . "ServicesHostGroups/";
$sg_path = $path . "ServicesServiceGroups/";
$meta_path = $path . "Meta/";
$path_sch = $path . "Scheduling/";

if ($continue) {
switch ($o) {
/*
* View of Service
*/
case "svc":
require_once $svc_path . "service.php";
break;
case "svcpb":
require_once $svc_path . "service.php";
break;
case "svc_warning":
require_once $svc_path . "service.php";
break;
case "svc_critical":
require_once $svc_path . "service.php";
break;
case "svc_unknown":
require_once $svc_path . "service.php";
break;
case "svc_ok":
require_once $svc_path . "service.php";
break;
case "svc_pending":
require_once $svc_path . "service.php";
break;
case "svc_unhandled":
require_once $svc_path . "service.php";
break;
Expand All @@ -157,8 +141,6 @@
break;

case "svcgrid":
require_once $svc_path . "serviceGrid.php";
break;
case "svcOV":
case "svcOV_pb":
require_once $svc_path . "serviceGrid.php";
Expand All @@ -170,8 +152,6 @@
* View by Service Groups
*/
case "svcgridSG":
require_once $sg_path . "serviceGridBySG.php";
break;
case "svcOVSG":
case "svcOVSG_pb":
require_once $sg_path . "serviceGridBySG.php";
Expand All @@ -184,27 +164,13 @@
* View By hosts groups
*/
case "svcgridHG":
require_once $hg_path . "serviceGridByHG.php";
break;
case "svcOVHG":
case "svcOVHG_pb":
require_once $hg_path . "serviceGridByHG.php";
break;
case "svcSumHG":
require_once $hg_path . "serviceSummaryByHG.php";
break;
/*
* Meta Services
*/
case "meta":
require_once $meta_path . "/metaService.php";
break;
/*
* Scheduling Queue
*/
case "svcSch":
require_once $path_sch . "serviceSchedule.php";
break;
default:
require_once $svc_path . "service.php";
break;
Expand Down