mirror of
https://github.com/openappsec/openappsec.git
synced 2025-11-18 18:20:36 +03:00
Compare commits
2 Commits
09-11-25-d
...
docker-sto
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
304fcb16d4 | ||
|
|
ad37257d7c |
@@ -1522,12 +1522,6 @@ 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,11 +227,6 @@ 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,9 +209,6 @@ 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
|
||||||
@@ -1152,9 +1149,6 @@ 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,11 +115,6 @@ 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