Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
Imldeployment
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IML Open Source
Imldeployment
Merge requests
!75
#7709 - update appmomitor client check for instances per rollout plugin
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
#7709 - update appmomitor client check for instances per rollout plugin
add-awx-test
into
master
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
Hahn Axel (hahn)
requested to merge
add-awx-test
into
master
4 months ago
Overview
0
Commits
1
Pipelines
0
Changes
1
Expand
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
24299308
1 commit,
4 months ago
1 file
+
21
−
18
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
public_html/appmonitor/index.php
+
21
−
18
Options
@@ -230,30 +230,33 @@ if(isset($aConfig['foreman']['api'])){
}
// #6421 - add check for AWX
// #7709 - update for instances per rollout plugin
if
(
isset
(
$aConfig
[
'plugins'
][
'rollout'
][
'awx'
])){
$aOpts
=
[];
$aOpts
[
'url'
]
=
$aConfig
[
'plugins'
][
'rollout'
][
'awx'
][
'url'
]
.
'/'
;
if
(
isset
(
$aConfig
[
'plugins'
][
'rollout'
][
'awx'
][
'user'
])){
$aOpts
[
'userpwd'
]
=
$aConfig
[
'plugins'
][
'rollout'
][
'awx'
][
'user'
]
.
(
isset
(
$aConfig
[
'plugins'
][
'rollout'
][
'awx'
][
'password'
])
?
':'
.
$aConfig
[
'plugins'
][
'rollout'
][
'awx'
][
'password'
]
foreach
(
$aConfig
[
'plugins'
][
'rollout'
]
as
$sId
=>
$aRolloutConfig
)
{
if
(
$aRolloutConfig
[
'plugin'
]
==
"awx"
)
{
$aOpts
[
'url'
]
=
$aRolloutConfig
[
'url'
]
.
'/'
;
$aOpts
[
'userpwd'
]
=
$aRolloutConfig
[
'user'
]
.
(
isset
(
$aRolloutConfig
[
'password'
])
?
':'
.
$aRolloutConfig
[
'password'
]
:
''
)
;
}
$oMonitor
->
addCheck
(
[
"name"
=>
"AWX API"
,
"description"
=>
"check if AWX api is available"
,
"group"
=>
"network"
,
"parent"
=>
"read config file"
,
"check"
=>
[
"function"
=>
"HttpContent"
,
"params"
=>
$aOpts
,
],
]
);
$oMonitor
->
addCheck
(
[
"name"
=>
"AWX API - "
.
$sId
,
"description"
=>
"check if AWX api is available"
,
"group"
=>
"network"
,
"parent"
=>
"read config file"
,
"check"
=>
[
"function"
=>
"HttpContent"
,
"params"
=>
$aOpts
,
],
]
);
}
}
}
// ----------------------------------------------------------------------
Loading