pass plugin and module names upstream
Costa Tsaousis (ktsaou) committed
Oct 15, 2017 at 12:40 UTC
898affab8771c9c4b2379b4b449eb80ffa1b68ae
1 file changed
+33
-21
src/rrdpush.c
+33
-21
@@ -81,34 +81,46 @@ static inline int need_to_send_chart_definition(RRDSET *st) {
81
static inline void rrdpush_send_chart_definition_nolock(RRDSET *st) {
82
rrdset_flag_set(st, RRDSET_FLAG_EXPOSED_UPSTREAM);
83
84
- buffer_sprintf(st->rrdhost->rrdpush_sender_buffer, "CHART \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" %ld %d \"%s %s %s\"\n"
85
- , st->id
86
- , st->name
87
- , st->title
88
- , st->units
89
- , st->family
90
- , st->context
91
- , rrdset_type_name(st->chart_type)
92
- , st->priority
93
- , st->update_every
94
- , rrdset_flag_check(st, RRDSET_FLAG_OBSOLETE)?"obsolete":""
95
- , rrdset_flag_check(st, RRDSET_FLAG_DETAIL)?"detail":""
96
- , rrdset_flag_check(st, RRDSET_FLAG_STORE_FIRST)?"store_first":""
84
+ buffer_sprintf(
85
+ st->rrdhost->rrdpush_sender_buffer
86
+ , "CHART \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" %ld %d \"%s %s %s\" \"%s\" \"%s\"\n"
87
+ , st->id
88
+ , st->name
89
+ , st->title
90
+ , st->units
91
+ , st->family
92
+ , st->context
93
+ , rrdset_type_name(st->chart_type)
94
+ , st->priority
95
+ , st->update_every
96
+ , rrdset_flag_check(st, RRDSET_FLAG_OBSOLETE)?"obsolete":""
97
+ , rrdset_flag_check(st, RRDSET_FLAG_DETAIL)?"detail":""
98
+ , rrdset_flag_check(st, RRDSET_FLAG_STORE_FIRST)?"store_first":""
99
+ , (st->plugin_name)?st->plugin_name:""
100
+ , (st->module_name)?st->module_name:""
101
);
102
103
RRDDIM *rd;
104
rrddim_foreach_read(rd, st) {
101
- buffer_sprintf(st->rrdhost->rrdpush_sender_buffer, "DIMENSION \"%s\" \"%s\" \"%s\" " COLLECTED_NUMBER_FORMAT " " COLLECTED_NUMBER_FORMAT " \"%s %s\"\n"
102
- , rd->id
103
- , rd->name
104
- , rrd_algorithm_name(rd->algorithm)
105
- , rd->multiplier
106
- , rd->divisor
107
- , rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN)?"hidden":""
108
- , rrddim_flag_check(rd, RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS)?"noreset":""
105
+ buffer_sprintf(
106
+ st->rrdhost->rrdpush_sender_buffer
107
+ , "DIMENSION \"%s\" \"%s\" \"%s\" " COLLECTED_NUMBER_FORMAT " " COLLECTED_NUMBER_FORMAT " \"%s %s\"\n"
108
+ , rd->id
109
+ , rd->name
110
+ , rrd_algorithm_name(rd->algorithm)
111
+ , rd->multiplier
112
+ , rd->divisor
113
+ , rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN)?"hidden":""
114
+ , rrddim_flag_check(rd, RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS)?"noreset":""
115
);
116
rd->exposed = 1;
117
}
118
+ /*
119
+ RRDSETVAR *rs;
120
+ for(rs = st->variables; rs ;rs = rs->next) {
121
+ if(unlikely(rs->type == ))
122
+ }
123
+ */
124
125
st->upstream_resync_time = st->last_collected_time.tv_sec + (remote_clock_resync_iterations * st->update_every);
126
}