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.

Sign up for GitHub

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

Jump to bottom

Fixes #7409: Support cfengine enterprise in check-rudder-agent #796

Merged
merged 1 commit into from
Nov 20, 2015
Merged

Fixes #7409: Support cfengine enterprise in check-rudder-agent #796

merged 1 commit into from
Nov 20, 2015

Conversation

peckpeck
Copy link
Member

ncharles
ncharles reviewed Nov 18, 2015
View reviewed changes
rudder-agent/SOURCES/check-rudder-agent
CFE_DISABLE_FILE=/opt/rudder/etc/disable-agent

LAST_UPDATE_FILE=${CFE_DIR}/last_successful_inputs_update
Copy link
Member

Choose a reason for hiding this comment

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

you removed it without adding it back, however you still use it

Copy link
Member

Choose a reason for hiding this comment

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

oh, forget it, i'e seen it's at the end of the file

@ncharles
Copy link
Member

@peckpeck : I tested the file, and got the following output:
WARNING: The file /var/cfengine/last_successful_inputs_update is older than 10 minutes, the agent is probably stuck. Purging the CFEngine lock database... Done
ERROR: The file /etc/init.d/rudder-agent does not exist and no backup exist. Please reinstall the rudder-agent package
ERROR: The file /etc/default/rudder-agent does not exist and no backup exist. Please reinstall the rudder-agent package
ERROR: The file /etc/cron.d/rudder-agent does not exist and no backup exist. Please reinstall the rudder-agent package

/etc/init.d, /etc/default/rudder-agent are not supposed to be there on enterprise only
And in cron.d, Ihave the file rudder-agent-nova

Could you fix the PR accordingly ?
Thank you :)

@peckpeck peckpeck force-pushed the bug_7409/support_cfengine_enterprise_in_check_rudder_agent branch from 41eb674 to cb7c3b1 Compare November 19, 2015 14:11
@peckpeck
Copy link
Member Author

PR updated
I didn't handle your WARNING since it seems to be legitimate

ncharles
ncharles reviewed Nov 20, 2015
View reviewed changes
rudder-agent/SOURCES/check-rudder-agent
# List the CFEngine processes running
CF_PROCESS_RUNNING=`${PS_COMMAND} | egrep "${CFE_BIN_DIR}/(cf-execd|cf-agent)" | sed -e '/grep/d' | cat`
CF_PROCESS_RUNNING=`${PS_COMMAND} | sed -ne "\\%${CFE_BIN_DIR}/(cf-execd|cf-agent)%p" | cat`
Copy link
Member

Choose a reason for hiding this comment

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

This does not detect correctly that the agent or cf-execd is running

@peckpeck peckpeck force-pushed the bug_7409/support_cfengine_enterprise_in_check_rudder_agent branch from cb7c3b1 to 7a1ee9e Compare November 20, 2015 16:14
@peckpeck
Copy link
Member Author

PR updated

@peckpeck peckpeck force-pushed the bug_7409/support_cfengine_enterprise_in_check_rudder_agent branch from 7a1ee9e to ffbd4d7 Compare November 20, 2015 16:59
@peckpeck
Copy link
Member Author

PR updated

ncharles added a commit that referenced this pull request Nov 20, 2015
@ncharles
Merge pull request #796 from peckpeck/bug_7409/support_cfengine_enter…
8363148 
…prise_in_check_rudder_agent

Fixes #7409: Support cfengine enterprise in check-rudder-agent
@ncharles ncharles merged commit 8363148 into Normation:branches/rudder/3.2 Nov 20, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@peckpeck @ncharles