Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions collection-scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ declare -a OSP_SERVICES=(
"aodh"
"logging"
"instanceha"
"watcher"
)
export OSP_SERVICES

Expand Down
18 changes: 18 additions & 0 deletions collection-scripts/gather_services_status
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ get_status() {
"glance")
get_glance_status
;;
"watcher")
get_watcher_status
;;
"designate")
get_designate_status
;;
Expand Down Expand Up @@ -214,6 +217,21 @@ get_glance_status() {
run_bg ${BASH_ALIASES[os]} image task list '>' "$GLANCE_PATH"/task_list
}

# Watcher service gathering - task
get_watcher_status() {
local WATCHER_PATH="$BASE_COLLECTION_PATH/ctlplane/watcher"
mkdir -p "$WATCHER_PATH"
run_bg ${BASH_ALIASES[os]} optimize goal list '>' "$WATCHER_PATH"/goal_list
run_bg ${BASH_ALIASES[os]} optimize strategy list '>' "$WATCHER_PATH"/strategy_list
run_bg ${BASH_ALIASES[os]} optimize audittemplate list '>' "$WATCHER_PATH"/audittemplate_list
run_bg ${BASH_ALIASES[os]} optimize audit list '>' "$WATCHER_PATH"/audit_list
run_bg ${BASH_ALIASES[os]} optimize actionplan list '>' "$WATCHER_PATH"/actionplan_list
run_bg ${BASH_ALIASES[os]} optimize action list '>' "$WATCHER_PATH"/action_list
run_bg ${BASH_ALIASES[os]} optimize service list '>' "$WATCHER_PATH"/watcher_service_list
run_bg ${BASH_ALIASES[os]} optimize datamodel list '>' "$WATCHER_PATH"/watcher_datamodel_list
Comment on lines +224 to +231

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not correct we shoudl not be collecting the datamodel actions, audits or action plans

the goals and stragies would only hcange if they added there own plugins for thos so the only thing i thikn we shoudl likely keep is the service list

Suggested change
run_bg ${BASH_ALIASES[os]} optimize goal list '>' "$WATCHER_PATH"/goal_list
run_bg ${BASH_ALIASES[os]} optimize strategy list '>' "$WATCHER_PATH"/strategy_list
run_bg ${BASH_ALIASES[os]} optimize audittemplate list '>' "$WATCHER_PATH"/audittemplate_list
run_bg ${BASH_ALIASES[os]} optimize audit list '>' "$WATCHER_PATH"/audit_list
run_bg ${BASH_ALIASES[os]} optimize actionplan list '>' "$WATCHER_PATH"/actionplan_list
run_bg ${BASH_ALIASES[os]} optimize action list '>' "$WATCHER_PATH"/action_list
run_bg ${BASH_ALIASES[os]} optimize service list '>' "$WATCHER_PATH"/watcher_service_list
run_bg ${BASH_ALIASES[os]} optimize datamodel list '>' "$WATCHER_PATH"/watcher_datamodel_list
run_bg ${BASH_ALIASES[os]} optimize service list '>' "$WATCHER_PATH"/watcher_service_list

if you look at the nova version you can see we intentiolly do not collelct the flavor or instances as we are not ment to collect the workload info via must gather

collection the action plans, actions autit templates and audits re all "workload info" in the context of watcher.

i maybe coudl see collectin the list of audittempelates but honeslty i dotn think that will be useful for debuging.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that probably the only useful part will be the service list and maybe audits (i.e. to see the parameters for questions like "my audit X is not doing what I'd expect) although for those case it will probably easier to ask for specific commands.

We can also keep the list of goals and strategies just to check that the deployment of watcher went fine.

Said that, I'd say the only bad side of it is extra space usage, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SeanMooney @amoralej you are correct, collecting all info does help. #116 now collects goal, strategy and services list.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the goals and stragies i think is fine

the probelm with the workload information is w eshoudl not be collecting data that might be sensivite and things liek the parmaters pass to an audit may be.

certainly i know we have to be careful with collecting ips and hostnames in general, the service list i think is ok but i think the datamodel is too far at least by default.

we could support it via a flag but i strongly suspect we would be much better off requesting this info explicit if necessary. if that happen often we can expand the list but for now lets keep this pretty simple and short.

}


# Designate service gathering - dns resources,
get_designate_status() {
local DESIGNATE_PATH="$BASE_COLLECTION_PATH/ctlplane/designate"
Expand Down