Removed tmem stat collection from xenstat plugin for Xen 4.13 (#7951)
Rushikesh Jadhav committed
Feb 26, 2020 at 12:46 UTC
17c0f9a70e122f17a3a6ad963603a10ab768a34b
1 file changed
+1
-97
collectors/xenstat.plugin/xenstat_plugin.c
+1
-97
@@ -83,16 +83,6 @@ struct vcpu_metrics {
83
struct vcpu_metrics *next;
84
};
85
86
-struct tmem_metrics {
87
- unsigned long long curr_eph_pages;
88
- unsigned long long succ_eph_gets;
89
- unsigned long long succ_pers_puts;
90
- unsigned long long succ_pers_gets;
91
-
92
- int pages_chart_generated;
93
- int operation_chart_generated;
94
-};
95
-
86
struct vbd_metrics {
87
unsigned int id;
88
@@ -152,7 +142,6 @@ struct domain_metrics {
142
unsigned long long cur_mem;
143
unsigned long long max_mem;
144
155
- struct tmem_metrics tmem;
145
struct vcpu_metrics *vcpu_root;
146
struct vbd_metrics *vbd_root;
147
struct network_metrics *network_root;
@@ -170,7 +159,6 @@ struct domain_metrics {
159
struct node_metrics{
160
unsigned long long tot_mem;
161
unsigned long long free_mem;
173
- long freeable_mb;
162
int num_domains;
163
unsigned int num_cpus;
164
unsigned long long node_cpu_hz;
@@ -415,7 +403,6 @@ static int xenstat_collect(xenstat_handle *xhandle, libxl_ctx *ctx, libxl_dominf
403
404
node_metrics.tot_mem = xenstat_node_tot_mem(node);
405
node_metrics.free_mem = xenstat_node_free_mem(node);
418
- node_metrics.freeable_mb = xenstat_node_freeable_mb(node);
406
node_metrics.num_domains = xenstat_node_num_domains(node);
407
node_metrics.num_cpus = xenstat_node_num_cpus(node);
408
node_metrics.node_cpu_hz = xenstat_node_cpu_hz(node);
@@ -457,12 +444,6 @@ static int xenstat_collect(xenstat_handle *xhandle, libxl_ctx *ctx, libxl_dominf
444
d->cur_mem = xenstat_domain_cur_mem(domain);
445
d->max_mem = xenstat_domain_max_mem(domain);
446
460
- xenstat_tmem *tmem = xenstat_domain_tmem(domain);
461
- d->tmem.curr_eph_pages = xenstat_tmem_curr_eph_pages(tmem);
462
- d->tmem.succ_eph_gets = xenstat_tmem_succ_eph_gets(tmem);
463
- d->tmem.succ_pers_puts = xenstat_tmem_succ_pers_puts(tmem);
464
- d->tmem.succ_pers_gets = xenstat_tmem_succ_pers_gets(tmem);
465
-
447
if(unlikely(vcpu_metrics_collect(d, domain) || vbd_metrics_collect(d, domain) || network_metrics_collect(d, domain))) {
448
xenstat_free_node(node);
449
return 1;
@@ -477,7 +458,7 @@ static int xenstat_collect(xenstat_handle *xhandle, libxl_ctx *ctx, libxl_dominf
458
}
459
460
static void xenstat_send_node_metrics() {
480
- static int mem_chart_generated = 0, tmem_chart_generated = 0, domains_chart_generated = 0, cpus_chart_generated = 0, cpu_freq_chart_generated = 0;
461
+ static int mem_chart_generated = 0, domains_chart_generated = 0, cpus_chart_generated = 0, cpu_freq_chart_generated = 0;
462
463
// ----------------------------------------------------------------
464
@@ -503,25 +484,6 @@ static void xenstat_send_node_metrics() {
484
485
// ----------------------------------------------------------------
486
506
- if(unlikely(!tmem_chart_generated)) {
507
- printf("CHART xenstat.tmem '' 'Freeable Transcedent Memory' 'MiB' 'memory' '' line %d %d '' %s\n"
508
- , NETDATA_CHART_PRIO_XENSTAT_NODE_TMEM
509
- , netdata_update_every
510
- , PLUGIN_XENSTAT_NAME
511
- );
512
- printf("DIMENSION %s '' absolute 1 %d\n", "freeable", netdata_update_every * 1024 * 1024);
513
- tmem_chart_generated = 1;
514
- }
515
-
516
- printf(
517
- "BEGIN xenstat.tmem\n"
518
- "SET freeable = %lld\n"
519
- "END\n"
520
- , (collected_number) node_metrics.freeable_mb
521
- );
522
-
523
- // ----------------------------------------------------------------
524
-
487
if(unlikely(!domains_chart_generated)) {
488
printf("CHART xenstat.domains '' 'Number of Domains' 'domains' 'domains' '' line %d %d '' %s\n"
489
, NETDATA_CHART_PRIO_XENSTAT_NODE_DOMAINS
@@ -617,30 +579,6 @@ static void print_domain_mem_chart_definition(char *type, int obsolete_flag) {
579
printf("DIMENSION current '' absolute 1 %d\n", netdata_update_every * 1024 * 1024);
580
}
581
620
-static void print_domain_tmem_pages_chart_definition(char *type, int obsolete_flag) {
621
- printf("CHART %s.tmem_pages '' 'Current Number of Transcedent Memory Ephemeral Pages' 'pages' 'memory' 'xendomain.tmem_pages' line %d %d %s %s\n"
622
- , type
623
- , NETDATA_CHART_PRIO_XENSTAT_DOMAIN_TMEM_PAGES
624
- , netdata_update_every
625
- , obsolete_flag ? "obsolete": "''"
626
- , PLUGIN_XENSTAT_NAME
627
- );
628
- printf("DIMENSION pages '' absolute 1 %d\n", netdata_update_every);
629
-}
630
-
631
-static void print_domain_tmem_operations_chart_definition(char *type, int obsolete_flag) {
632
- printf("CHART %s.tmem_operations '' 'Successful Transcedent Memory Puts and Gets' 'events/s' 'memory' 'xendomain.tmem_operations' line %d %d %s %s\n"
633
- , type
634
- , NETDATA_CHART_PRIO_XENSTAT_DOMAIN_TMEM_OPERATIONS
635
- , netdata_update_every
636
- , obsolete_flag ? "obsolete": "''"
637
- , PLUGIN_XENSTAT_NAME
638
- );
639
- printf("DIMENSION ephemeral_gets 'ephemeral gets' incremental 1 %d\n", netdata_update_every);
640
- printf("DIMENSION persistent_puts 'persistent puts' incremental 1 %d\n", netdata_update_every);
641
- printf("DIMENSION persistent_gets 'persistent gets' incremental 1 %d\n", netdata_update_every);
642
-}
643
-
582
static void print_domain_vcpu_chart_definition(char *type, struct domain_metrics *d, int obsolete_flag) {
583
struct vcpu_metrics *vcpu_m;
584
@@ -845,38 +783,6 @@ static void xenstat_send_domain_metrics() {
783
784
// ----------------------------------------------------------------
785
848
- if(unlikely(!d->tmem.pages_chart_generated)) {
849
- print_domain_tmem_pages_chart_definition(type, CHART_IS_NOT_OBSOLETE);
850
- d->tmem.pages_chart_generated = 1;
851
- }
852
- printf(
853
- "BEGIN %s.tmem_pages\n"
854
- "SET pages = %lld\n"
855
- "END\n"
856
- , type
857
- , (collected_number)d->tmem.curr_eph_pages
858
- );
859
-
860
- // ----------------------------------------------------------------
861
-
862
- if(unlikely(!d->tmem.operation_chart_generated)) {
863
- print_domain_tmem_operations_chart_definition(type, CHART_IS_NOT_OBSOLETE);
864
- d->tmem.operation_chart_generated = 1;
865
- }
866
- printf(
867
- "BEGIN %s.tmem_operations\n"
868
- "SET ephemeral_gets = %lld\n"
869
- "SET persistent_puts = %lld\n"
870
- "SET persistent_gets = %lld\n"
871
- "END\n"
872
- , type
873
- , (collected_number)d->tmem.succ_eph_gets
874
- , (collected_number)d->tmem.succ_pers_puts
875
- , (collected_number)d->tmem.succ_eph_gets
876
- );
877
-
878
- // ----------------------------------------------------------------
879
-
786
struct vbd_metrics *vbd_m;
787
for(vbd_m = d->vbd_root; vbd_m; vbd_m = vbd_m->next) {
788
if(likely(vbd_m->updated && !vbd_m->error)) {
@@ -1036,8 +942,6 @@ static void xenstat_send_domain_metrics() {
942
print_domain_cpu_chart_definition(type, CHART_IS_OBSOLETE);
943
print_domain_vcpu_chart_definition(type, d, CHART_IS_OBSOLETE);
944
print_domain_mem_chart_definition(type, CHART_IS_OBSOLETE);
1039
- print_domain_tmem_pages_chart_definition(type, CHART_IS_OBSOLETE);
1040
- print_domain_tmem_operations_chart_definition(type, CHART_IS_OBSOLETE);
945
946
d = domain_metrics_free(d);
947
}