Add host_cloud_enabled attribute to analytics (#11100)
* add host_cloud_enabled attribute to analytics * change order * use defines in appconfig_get_boolean
Emmanuel Vasilakis committed
May 6, 2021 at 15:20 UTC
bebd56cd603bd4a2e68e71dd9021ea4e34c41dc1
3 files changed
+53
-19
daemon/analytics.c
+49
-18
@@ -53,6 +53,7 @@ void analytics_log_data(void)
53
debug(D_ANALYTICS, "NETDATA_HOST_ACLK_AVAILABLE : [%s]", analytics_data.netdata_host_aclk_available);
54
debug(D_ANALYTICS, "NETDATA_HOST_ACLK_IMPLEMENTATION : [%s]", analytics_data.netdata_host_aclk_implementation);
55
debug(D_ANALYTICS, "NETDATA_HOST_AGENT_CLAIMED : [%s]", analytics_data.netdata_host_agent_claimed);
56
+ debug(D_ANALYTICS, "NETDATA_HOST_CLOUD_ENABLED : [%s]", analytics_data.netdata_host_cloud_enabled);
57
}
58
59
/*
@@ -91,6 +92,7 @@ void analytics_free_data(void)
92
freez(analytics_data.netdata_host_aclk_available);
93
freez(analytics_data.netdata_host_aclk_implementation);
94
freez(analytics_data.netdata_host_agent_claimed);
95
+ freez(analytics_data.netdata_host_cloud_enabled);
96
}
97
98
/*
@@ -565,7 +567,15 @@ void set_late_global_environment()
567
{
568
analytics_set_data(&analytics_data.netdata_config_stream_enabled, default_rrdpush_enabled ? "true" : "false");
569
analytics_set_data_str(&analytics_data.netdata_config_memory_mode, (char *)rrd_memory_mode_name(default_rrd_memory_mode));
568
- analytics_set_data(&analytics_data.netdata_config_exporting_enabled, appconfig_get_boolean(&exporting_config, CONFIG_SECTION_EXPORTING, "enabled", 1) ? "true" : "false");
570
+ analytics_set_data(&analytics_data.netdata_config_exporting_enabled, appconfig_get_boolean(&exporting_config, CONFIG_SECTION_EXPORTING, "enabled", CONFIG_BOOLEAN_NO) ? "true" : "false");
571
+
572
+#ifdef DISABLE_CLOUD
573
+ analytics_set_data(&analytics_data.netdata_host_cloud_enabled, "false");
574
+#else
575
+ analytics_set_data(
576
+ &analytics_data.netdata_host_cloud_enabled,
577
+ appconfig_get_boolean(&cloud_config, CONFIG_SECTION_GLOBAL, "enabled", CONFIG_BOOLEAN_YES) ? "true" : "false");
578
+#endif
579
580
#ifdef ENABLE_DBENGINE
581
{
@@ -742,6 +752,7 @@ void set_global_environment()
752
analytics_set_data(&analytics_data.netdata_host_aclk_implementation, "null");
753
analytics_set_data(&analytics_data.netdata_host_aclk_available, "null");
754
analytics_set_data(&analytics_data.netdata_host_agent_claimed, "null");
755
+ analytics_set_data(&analytics_data.netdata_host_cloud_enabled, "null");
756
757
analytics_data.prometheus_hits = 0;
758
analytics_data.shell_hits = 0;
@@ -823,23 +834,43 @@ void send_statistics(const char *action, const char *action_result, const char *
834
835
sprintf(
836
command_to_run,
826
- "%s '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' ",
827
- as_script, action, action_result, action_data, analytics_data.netdata_config_stream_enabled,
828
- analytics_data.netdata_config_memory_mode, analytics_data.netdata_config_exporting_enabled,
829
- analytics_data.netdata_exporting_connectors, analytics_data.netdata_allmetrics_prometheus_used,
830
- analytics_data.netdata_allmetrics_shell_used, analytics_data.netdata_allmetrics_json_used,
831
- analytics_data.netdata_dashboard_used, analytics_data.netdata_collectors,
832
- analytics_data.netdata_collectors_count, analytics_data.netdata_buildinfo,
833
- analytics_data.netdata_config_page_cache_size, analytics_data.netdata_config_multidb_disk_quota,
834
- analytics_data.netdata_config_https_enabled, analytics_data.netdata_config_web_enabled,
835
- analytics_data.netdata_config_release_channel, analytics_data.netdata_mirrored_host_count,
836
- analytics_data.netdata_mirrored_hosts_reachable, analytics_data.netdata_mirrored_hosts_unreachable,
837
- analytics_data.netdata_notification_methods, analytics_data.netdata_alarms_normal,
838
- analytics_data.netdata_alarms_warning, analytics_data.netdata_alarms_critical,
839
- analytics_data.netdata_charts_count, analytics_data.netdata_metrics_count,
840
- analytics_data.netdata_config_is_parent, analytics_data.netdata_config_hosts_available,
841
- analytics_data.netdata_host_cloud_available, analytics_data.netdata_host_aclk_available,
842
- analytics_data.netdata_host_aclk_implementation, analytics_data.netdata_host_agent_claimed);
837
+ "%s '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s' ",
838
+ as_script,
839
+ action,
840
+ action_result,
841
+ action_data,
842
+ analytics_data.netdata_config_stream_enabled,
843
+ analytics_data.netdata_config_memory_mode,
844
+ analytics_data.netdata_config_exporting_enabled,
845
+ analytics_data.netdata_exporting_connectors,
846
+ analytics_data.netdata_allmetrics_prometheus_used,
847
+ analytics_data.netdata_allmetrics_shell_used,
848
+ analytics_data.netdata_allmetrics_json_used,
849
+ analytics_data.netdata_dashboard_used,
850
+ analytics_data.netdata_collectors,
851
+ analytics_data.netdata_collectors_count,
852
+ analytics_data.netdata_buildinfo,
853
+ analytics_data.netdata_config_page_cache_size,
854
+ analytics_data.netdata_config_multidb_disk_quota,
855
+ analytics_data.netdata_config_https_enabled,
856
+ analytics_data.netdata_config_web_enabled,
857
+ analytics_data.netdata_config_release_channel,
858
+ analytics_data.netdata_mirrored_host_count,
859
+ analytics_data.netdata_mirrored_hosts_reachable,
860
+ analytics_data.netdata_mirrored_hosts_unreachable,
861
+ analytics_data.netdata_notification_methods,
862
+ analytics_data.netdata_alarms_normal,
863
+ analytics_data.netdata_alarms_warning,
864
+ analytics_data.netdata_alarms_critical,
865
+ analytics_data.netdata_charts_count,
866
+ analytics_data.netdata_metrics_count,
867
+ analytics_data.netdata_config_is_parent,
868
+ analytics_data.netdata_config_hosts_available,
869
+ analytics_data.netdata_host_cloud_available,
870
+ analytics_data.netdata_host_aclk_available,
871
+ analytics_data.netdata_host_aclk_implementation,
872
+ analytics_data.netdata_host_agent_claimed,
873
+ analytics_data.netdata_host_cloud_enabled);
874
875
info("%s '%s' '%s' '%s'", as_script, action, action_result, action_data);
876
daemon/analytics.h
+2
-1
@@ -29,7 +29,7 @@
29
},
30
31
/* Needed to calculate the space needed for parameters */
32
-#define ANALYTICS_NO_OF_ITEMS 31
32
+#define ANALYTICS_NO_OF_ITEMS 32
33
34
struct analytics_data {
35
char *netdata_config_stream_enabled;
@@ -63,6 +63,7 @@ struct analytics_data {
63
char *netdata_host_aclk_available;
64
char *netdata_host_aclk_implementation;
65
char *netdata_host_agent_claimed;
66
+ char *netdata_host_cloud_enabled;
67
68
size_t data_length;
69
daemon/anonymous-statistics.sh.in
+2
@@ -59,6 +59,7 @@ NETDATA_HOST_CLOUD_AVAILABLE="${31}"
59
NETDATA_HOST_ACLK_AVAILABLE="${32}"
60
NETDATA_HOST_ACLK_IMPLEMENTATION="${33}"
61
NETDATA_HOST_AGENT_CLAIMED="${34}"
62
+NETDATA_HOST_CLOUD_ENABLED="${35}"
63
64
# define body of request to be sent
65
REQ_BODY="$(cat << EOF
@@ -132,6 +133,7 @@ REQ_BODY="$(cat << EOF
133
"host_allmetrics_json_used": ${NETDATA_ALLMETRICS_JSON_USED},
134
"host_dashboard_used": ${NETDATA_DASHBOARD_USED},
135
"host_cloud_available": ${NETDATA_HOST_CLOUD_AVAILABLE},
136
+ "host_cloud_enabled": ${NETDATA_HOST_CLOUD_ENABLED},
137
"host_agent_claimed": ${NETDATA_HOST_AGENT_CLAIMED},
138
"host_aclk_available": ${NETDATA_HOST_ACLK_AVAILABLE},
139
"host_aclk_implementation": ${NETDATA_HOST_ACLK_IMPLEMENTATION},