mirror of
https://github.com/openappsec/openappsec.git
synced 2025-11-18 18:20:36 +03:00
Compare commits
3 Commits
update_doc
...
09-11-25-d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae894b29bc | ||
|
|
c90862d74c | ||
|
|
b7923dfd8c |
@@ -15,6 +15,21 @@ var_mode=
|
|||||||
var_token=
|
var_token=
|
||||||
var_ignore=
|
var_ignore=
|
||||||
init=
|
init=
|
||||||
|
active_watchdog_pid=
|
||||||
|
|
||||||
|
cleanup() {
|
||||||
|
local signal="$1"
|
||||||
|
echo "[$(date '+%Y-%m-%d %H:%M:%S')] Signal ${signal} was received, exiting gracefully..." >&2
|
||||||
|
if [ -n "${active_watchdog_pid}" ] && ps -p ${active_watchdog_pid} > /dev/null 2>&1; then
|
||||||
|
kill -TERM ${active_watchdog_pid} 2>/dev/null || true
|
||||||
|
wait ${active_watchdog_pid} 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
echo "Cleanup completed. Exiting now." >&2
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
trap 'cleanup SIGTERM' SIGTERM
|
||||||
|
trap 'cleanup SIGINT' SIGINT
|
||||||
|
|
||||||
if [ ! -f /nano-service-installers/$ORCHESTRATION_INSTALLATION_SCRIPT ]; then
|
if [ ! -f /nano-service-installers/$ORCHESTRATION_INSTALLATION_SCRIPT ]; then
|
||||||
echo "Error: agent installation package doesn't exist."
|
echo "Error: agent installation package doesn't exist."
|
||||||
|
|||||||
@@ -1522,6 +1522,12 @@ private:
|
|||||||
|
|
||||||
agent_data_report << make_pair("registeredServer", i_agent_details->getRegisteredServer());
|
agent_data_report << make_pair("registeredServer", i_agent_details->getRegisteredServer());
|
||||||
|
|
||||||
|
const char *prometheus_env = getenv("PROMETHEUS");
|
||||||
|
if (prometheus_env != nullptr) {
|
||||||
|
auto enable_prometheus = string(prometheus_env) == "true";
|
||||||
|
agent_data_report << AgentReportFieldWithLabel("enablePrometheus", enable_prometheus ? "true" : "false");
|
||||||
|
}
|
||||||
|
|
||||||
#if defined(gaia) || defined(smb)
|
#if defined(gaia) || defined(smb)
|
||||||
if (i_details_resolver->compareCheckpointVersion(8100, greater_equal<int>())) {
|
if (i_details_resolver->compareCheckpointVersion(8100, greater_equal<int>())) {
|
||||||
agent_data_report << AgentReportFieldWithLabel("isCheckpointVersionGER81", "true");
|
agent_data_report << AgentReportFieldWithLabel("isCheckpointVersionGER81", "true");
|
||||||
|
|||||||
@@ -227,6 +227,11 @@ FogAuthenticator::registerAgent(
|
|||||||
|
|
||||||
request << make_pair("userEdition", getUserEdition());
|
request << make_pair("userEdition", getUserEdition());
|
||||||
|
|
||||||
|
const char *prometheus_env = getenv("PROMETHEUS");
|
||||||
|
if (prometheus_env != nullptr) {
|
||||||
|
request << make_pair("enablePrometheus", string(prometheus_env) == "true" ? "true" : "false");
|
||||||
|
}
|
||||||
|
|
||||||
if (getDeplymentType() == "Docker" || getDeplymentType() == "K8S") {
|
if (getDeplymentType() == "Docker" || getDeplymentType() == "K8S") {
|
||||||
const char *image_version_otp = getenv("IMAGE_VERSION");
|
const char *image_version_otp = getenv("IMAGE_VERSION");
|
||||||
if (image_version_otp) {
|
if (image_version_otp) {
|
||||||
|
|||||||
@@ -209,6 +209,9 @@ save_local_policy_config()
|
|||||||
if [ -n "${CP_ENV_FILESYSTEM}" ] ; then
|
if [ -n "${CP_ENV_FILESYSTEM}" ] ; then
|
||||||
export FILESYSTEM_PATH=$CP_ENV_FILESYSTEM
|
export FILESYSTEM_PATH=$CP_ENV_FILESYSTEM
|
||||||
fi
|
fi
|
||||||
|
if [ -n "${PROMETHEUS}" ] ; then
|
||||||
|
export PROMETHEUS=$PROMETHEUS
|
||||||
|
fi
|
||||||
if [ -n "${CP_ENV_LOG_FILE}" ] ; then
|
if [ -n "${CP_ENV_LOG_FILE}" ] ; then
|
||||||
LOG_FILE_PATH=$CP_ENV_LOG_FILE
|
LOG_FILE_PATH=$CP_ENV_LOG_FILE
|
||||||
fi
|
fi
|
||||||
@@ -1149,6 +1152,9 @@ install_orchestration()
|
|||||||
if [ -n "${FILESYSTEM_PATH}" ]; then
|
if [ -n "${FILESYSTEM_PATH}" ]; then
|
||||||
echo "CP_ENV_FILESYSTEM=${FILESYSTEM_PATH}" >> ${FILESYSTEM_PATH}/${ENV_DETAILS_FILE}
|
echo "CP_ENV_FILESYSTEM=${FILESYSTEM_PATH}" >> ${FILESYSTEM_PATH}/${ENV_DETAILS_FILE}
|
||||||
fi
|
fi
|
||||||
|
if [ -n "${PROMETHEUS}" ]; then
|
||||||
|
echo "PROMETHEUS=${PROMETHEUS}" >> ${FILESYSTEM_PATH}/${ENV_DETAILS_FILE}
|
||||||
|
fi
|
||||||
if [ -n "${VS_ID}" ]; then
|
if [ -n "${VS_ID}" ]; then
|
||||||
echo "CP_VS_ID=${VS_ID}" >> ${FILESYSTEM_PATH}/${ENV_DETAILS_FILE}
|
echo "CP_VS_ID=${VS_ID}" >> ${FILESYSTEM_PATH}/${ENV_DETAILS_FILE}
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -115,6 +115,11 @@ load_paths()
|
|||||||
if [ -n "${CP_ENV_LOG_FILE}" ]; then
|
if [ -n "${CP_ENV_LOG_FILE}" ]; then
|
||||||
LOG_FILE_PATH=$CP_ENV_LOG_FILE
|
LOG_FILE_PATH=$CP_ENV_LOG_FILE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -n "${PROMETHEUS}" ]; then
|
||||||
|
export PROMETHEUS=$PROMETHEUS
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -n "${CP_VS_ID}" ]; then
|
if [ -n "${CP_VS_ID}" ]; then
|
||||||
VS_ID=${CP_VS_ID}
|
VS_ID=${CP_VS_ID}
|
||||||
VS_EVAL_PREFIX="ip netns exec CTX0000${VS_ID} env"
|
VS_EVAL_PREFIX="ip netns exec CTX0000${VS_ID} env"
|
||||||
|
|||||||
Reference in New Issue
Block a user