add 'containers priority' option to cgroups plugin (#5700)
* add 'containers priority' option to cgroups plugin * rename var to cgroup_containers_chart_priority * minor
Ilya Mashchenko committed
Mar 25, 2019 at 16:27 UTC
1ad58c3b1238ed1d2d4a835111a831dc00799a07
1 file changed
+21
-16
collectors/cgroups.plugin/sys_fs_cgroup.c
+21
-16
@@ -33,6 +33,7 @@ static int cgroup_search_in_devices = 1;
33
static int cgroup_enable_new_cgroups_detected_at_runtime = 1;
34
static int cgroup_check_for_new_every = 10;
35
static int cgroup_update_every = 1;
36
+static int cgroup_containers_chart_priority = NETDATA_CHART_PRIO_CGROUPS_CONTAINERS;
37
38
static int cgroup_recheck_zero_blkio_every_iterations = 10;
39
static int cgroup_recheck_zero_mem_failcnt_every_iterations = 10;
@@ -79,6 +80,10 @@ void read_cgroup_plugin_configuration() {
80
if(cgroup_check_for_new_every < cgroup_update_every)
81
cgroup_check_for_new_every = cgroup_update_every;
82
83
+ cgroup_containers_chart_priority = (int)config_get_number("plugin:cgroups", "containers priority", cgroup_containers_chart_priority);
84
+ if(cgroup_containers_chart_priority < 1)
85
+ cgroup_containers_chart_priority = NETDATA_CHART_PRIO_CGROUPS_CONTAINERS;
86
+
87
cgroup_enable_cpuacct_stat = config_get_boolean_ondemand("plugin:cgroups", "enable cpuacct stat (total CPU)", cgroup_enable_cpuacct_stat);
88
cgroup_enable_cpuacct_usage = config_get_boolean_ondemand("plugin:cgroups", "enable cpuacct usage (per core CPU)", cgroup_enable_cpuacct_usage);
89
@@ -2433,7 +2438,7 @@ void update_cgroup_charts(int update_every) {
2438
, "percentage"
2439
, PLUGIN_CGROUPS_NAME
2440
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2436
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS
2441
+ , cgroup_containers_chart_priority
2442
, update_every
2443
, RRDSET_TYPE_STACKED
2444
);
@@ -2493,7 +2498,7 @@ void update_cgroup_charts(int update_every) {
2498
, "percentage"
2499
, PLUGIN_CGROUPS_NAME
2500
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2496
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS - 1
2501
+ , cgroup_containers_chart_priority - 1
2502
, update_every
2503
, RRDSET_TYPE_LINE
2504
);
@@ -2542,7 +2547,7 @@ void update_cgroup_charts(int update_every) {
2547
, "percentage"
2548
, PLUGIN_CGROUPS_NAME
2549
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2545
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 100
2550
+ , cgroup_containers_chart_priority + 100
2551
, update_every
2552
, RRDSET_TYPE_STACKED
2553
);
@@ -2576,7 +2581,7 @@ void update_cgroup_charts(int update_every) {
2581
, "MiB"
2582
, PLUGIN_CGROUPS_NAME
2583
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2579
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 210
2584
+ , cgroup_containers_chart_priority + 210
2585
, update_every
2586
, RRDSET_TYPE_STACKED
2587
);
@@ -2616,7 +2621,7 @@ void update_cgroup_charts(int update_every) {
2621
, "MiB"
2622
, PLUGIN_CGROUPS_NAME
2623
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2619
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 300
2624
+ , cgroup_containers_chart_priority + 300
2625
, update_every
2626
, RRDSET_TYPE_AREA
2627
);
@@ -2648,7 +2653,7 @@ void update_cgroup_charts(int update_every) {
2653
, "MiB/s"
2654
, PLUGIN_CGROUPS_NAME
2655
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2651
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 400
2656
+ , cgroup_containers_chart_priority + 400
2657
, update_every
2658
, RRDSET_TYPE_LINE
2659
);
@@ -2676,7 +2681,7 @@ void update_cgroup_charts(int update_every) {
2681
, "MiB/s"
2682
, PLUGIN_CGROUPS_NAME
2683
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2679
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 500
2684
+ , cgroup_containers_chart_priority + 500
2685
, update_every
2686
, RRDSET_TYPE_LINE
2687
);
@@ -2706,7 +2711,7 @@ void update_cgroup_charts(int update_every) {
2711
, "MiB"
2712
, PLUGIN_CGROUPS_NAME
2713
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2709
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 200
2714
+ , cgroup_containers_chart_priority + 200
2715
, update_every
2716
, RRDSET_TYPE_STACKED
2717
);
@@ -2763,7 +2768,7 @@ void update_cgroup_charts(int update_every) {
2768
, "MiB"
2769
, PLUGIN_CGROUPS_NAME
2770
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2766
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 199
2771
+ , cgroup_containers_chart_priority + 199
2772
, update_every
2773
, RRDSET_TYPE_STACKED
2774
);
@@ -2805,7 +2810,7 @@ void update_cgroup_charts(int update_every) {
2810
, "count"
2811
, PLUGIN_CGROUPS_NAME
2812
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2808
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 250
2813
+ , cgroup_containers_chart_priority + 250
2814
, update_every
2815
, RRDSET_TYPE_LINE
2816
);
@@ -2833,7 +2838,7 @@ void update_cgroup_charts(int update_every) {
2838
, "KiB/s"
2839
, PLUGIN_CGROUPS_NAME
2840
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2836
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 1200
2841
+ , cgroup_containers_chart_priority + 1200
2842
, update_every
2843
, RRDSET_TYPE_AREA
2844
);
@@ -2863,7 +2868,7 @@ void update_cgroup_charts(int update_every) {
2868
, "operations/s"
2869
, PLUGIN_CGROUPS_NAME
2870
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2866
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 1200
2871
+ , cgroup_containers_chart_priority + 1200
2872
, update_every
2873
, RRDSET_TYPE_LINE
2874
);
@@ -2893,7 +2898,7 @@ void update_cgroup_charts(int update_every) {
2898
, "KiB/s"
2899
, PLUGIN_CGROUPS_NAME
2900
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2896
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 1200
2901
+ , cgroup_containers_chart_priority + 1200
2902
, update_every
2903
, RRDSET_TYPE_AREA
2904
);
@@ -2923,7 +2928,7 @@ void update_cgroup_charts(int update_every) {
2928
, "operations/s"
2929
, PLUGIN_CGROUPS_NAME
2930
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2926
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 1200
2931
+ , cgroup_containers_chart_priority + 1200
2932
, update_every
2933
, RRDSET_TYPE_LINE
2934
);
@@ -2953,7 +2958,7 @@ void update_cgroup_charts(int update_every) {
2958
, "operations"
2959
, PLUGIN_CGROUPS_NAME
2960
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2956
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 2000
2961
+ , cgroup_containers_chart_priority + 2000
2962
, update_every
2963
, RRDSET_TYPE_LINE
2964
);
@@ -2983,7 +2988,7 @@ void update_cgroup_charts(int update_every) {
2988
, "operations/s"
2989
, PLUGIN_CGROUPS_NAME
2990
, PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2986
- , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 2100
2991
+ , cgroup_containers_chart_priority + 2100
2992
, update_every
2993
, RRDSET_TYPE_LINE
2994
);