diff options
| author | Costa Tsaousis <costa@netdata.cloud> | 2022-09-07 15:28:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-07 15:28:30 +0300 |
| commit | 3f6a75250d8251b0142248ed2f33f7d857ee21c8 (patch) | |
| tree | f8fd7544a2fb509b295e6bd5267baab6014bc787 /exporting/prometheus | |
| parent | 17e0676b5bb6b11ad9aec705ade05163dcc2de31 (diff) | |
Obsolete RRDSET state (#13635)
* move chart_labels to rrdset
* rename chart_labels to rrdlabels
* renamed hash_id to uuid
* turned is_ar_chart into an rrdset flag
* removed rrdset state
* removed unused senders_connected member of rrdhost
* removed unused host flag RRDHOST_FLAG_MULTIHOST
* renamed rrdhost host_labels to rrdlabels
* Update exporting unit tests
Co-authored-by: Vladimir Kobal <vlad@prokk.net>
Diffstat (limited to 'exporting/prometheus')
| -rw-r--r-- | exporting/prometheus/prometheus.c | 4 | ||||
| -rw-r--r-- | exporting/prometheus/remote_write/remote_write.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/exporting/prometheus/prometheus.c b/exporting/prometheus/prometheus.c index 560022b72f..26c0811d6f 100644 --- a/exporting/prometheus/prometheus.c +++ b/exporting/prometheus/prometheus.c @@ -29,7 +29,7 @@ inline int can_send_rrdset(struct instance *instance, RRDSET *st, SIMPLE_PATTERN #endif // Do not send anomaly rates charts. - if (st->state && st->state->is_ar_chart) + if (rrdset_is_ar_chart(st)) return 0; if (unlikely(rrdset_flag_check(st, RRDSET_FLAG_EXPORTING_IGNORE))) @@ -327,7 +327,7 @@ void format_host_labels_prometheus(struct instance *instance, RRDHOST *host) .instance = instance, .count = 0 }; - rrdlabels_walkthrough_read(host->host_labels, format_prometheus_label_callback, &tmp); + rrdlabels_walkthrough_read(host->rrdlabels, format_prometheus_label_callback, &tmp); } struct host_variables_callback_options { diff --git a/exporting/prometheus/remote_write/remote_write.c b/exporting/prometheus/remote_write/remote_write.c index 29215283e8..ad337513eb 100644 --- a/exporting/prometheus/remote_write/remote_write.c +++ b/exporting/prometheus/remote_write/remote_write.c @@ -183,7 +183,7 @@ int format_host_prometheus_remote_write(struct instance *instance, RRDHOST *host .write_request = connector_specific_data->write_request, .instance = instance }; - rrdlabels_walkthrough_read(host->host_labels, format_remote_write_label_callback, &tmp); + rrdlabels_walkthrough_read(host->rrdlabels, format_remote_write_label_callback, &tmp); } return 0; |