Fixes #18568: Fix metrics-reporting script #2381
Conversation
|
Currently broken so the risk should be quite self-contained |
| @@ -139,16 +142,19 @@ def metrics(): | |||
| pass | |||
|
|
|||
| # Installation date | |||
| cmd="find /opt/rudder/bin/ -type f -exec stat -c \"%Z %n\" {} \; | sort -n | head -n1 | awk '{print $2}' | xargs -r stat -c \"%z\"" | |||
| cmd="stat -c \"%y\" /var/rudder/cfengine-community/ppkeys/localhost.pub" | |||
There was a problem hiding this comment.
not perfect but previous commands gave me latest uprade date
| @@ -55,7 +58,7 @@ def metrics(): | |||
| data = { } | |||
|
|
|||
| # Define the versionning of the file | |||
| data['file_version'] = "2" | |||
| data['file_version'] = "3" | |||
There was a problem hiding this comment.
we should maybe do this in 6.2
There was a problem hiding this comment.
No, I think it's ok, because the user of that file/API is us - so the burden is on our side.
|
PR updated with a new commit |
| @@ -195,7 +204,7 @@ def init_commands(): | |||
| psql_host = match.group(1) | |||
| psql_port = match.group(2) | |||
| psql_cmd = "psql -h " + psql_host + " -U " + psql_user | |||
| ldap_cmd = "/opt/rudder/bin/ldapsearch -x -z0 -h " + ldap_host + " -p " + ldap_port + " -D " + ldap_user + " -w " + ldap_pwd | |||
| ldap_cmd = "ldapsearch -x -z0 -h " + ldap_host + " -p " + ldap_port + " -D " + ldap_user + " -w " + ldap_pwd | |||
|
This PR is not mergeable to upper versions. |
|
OK, squash merging this PR |
amousset
force-pushed
the
bug_18568/fix_metrics_reporting_script
branch
from
437bef2
to
6d46971
Compare
https://issues.rudder.io/issues/18568