16 files changed, 39 insertions, 684 deletions

diff --git a/aclk/schema-wrappers/capability.cc b/aclk/schema-wrappers/capability.cc
index 769806f90..af45740a9 100644
--- a/aclk/schema-wrappers/capability.cc
+++ b/aclk/schema-wrappers/capability.cc
@@ -4,7 +4,7 @@
 
 #include "capability.h"
 
-void capability_set(aclk_lib::v1::Capability *proto_capa, struct capability *c_capa) {
+void capability_set(aclk_lib::v1::Capability *proto_capa, const struct capability *c_capa) {
     proto_capa->set_name(c_capa->name);
     proto_capa->set_enabled(c_capa->enabled);
     proto_capa->set_version(c_capa->version);
diff --git a/aclk/schema-wrappers/capability.h b/aclk/schema-wrappers/capability.h
index 9517a8716..c6085a44b 100644
--- a/aclk/schema-wrappers/capability.h
+++ b/aclk/schema-wrappers/capability.h
@@ -18,7 +18,7 @@ struct capability {
 
 #include "proto/aclk/v1/lib.pb.h"
 
-void capability_set(aclk_lib::v1::Capability *proto_capa, struct capability *c_capa);
+void capability_set(aclk_lib::v1::Capability *proto_capa, const struct capability *c_capa);
 #endif
 
 #endif /* ACLK_SCHEMA_CAPABILITY_H */
diff --git a/aclk/schema-wrappers/chart_config.cc b/aclk/schema-wrappers/chart_config.cc
deleted file mode 100644
index 87e34e0df..000000000
--- a/aclk/schema-wrappers/chart_config.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "chart_config.h"
-
-#include "proto/chart/v1/config.pb.h"
-
-#include "libnetdata/libnetdata.h"
-
-#include "schema_wrapper_utils.h"
-
-void destroy_update_chart_config(struct update_chart_config *cfg)
-{
-    freez(cfg->claim_id);
-    freez(cfg->node_id);
-    freez(cfg->hashes);
-}
-
-void destroy_chart_config_updated(struct chart_config_updated *cfg)
-{
-    freez(cfg->type);
-    freez(cfg->family);
-    freez(cfg->context);
-    freez(cfg->title);
-    freez(cfg->plugin);
-    freez(cfg->module);
-    freez(cfg->units);
-    freez(cfg->config_hash);
-}
-
-struct update_chart_config parse_update_chart_config(const char *data, size_t len)
-{
-    chart::v1::UpdateChartConfigs cfgs;
-    update_chart_config res;
-    memset(&res, 0, sizeof(res));
-
-    if (!cfgs.ParseFromArray(data, len))
-        return res;
-
-    res.claim_id = strdupz(cfgs.claim_id().c_str());
-    res.node_id = strdupz(cfgs.node_id().c_str());
-
-    // to not do bazillion tiny allocations for individual strings
-    // we calculate how much memory we will need for all of them
-    // and allocate at once
-    int hash_count = cfgs.config_hashes_size();
-    size_t total_strlen = 0;
-    for (int i = 0; i < hash_count; i++)
-        total_strlen += cfgs.config_hashes(i).length();
-    total_strlen += hash_count; //null bytes
-
-    res.hashes = (char**)callocz( 1,
-        (hash_count+1) * sizeof(char*) + //char * array incl. terminating NULL at the end
-        total_strlen //strings themselves incl. 1 null byte each
-    );
-
-    char* dest = ((char*)res.hashes) + (hash_count + 1 /* NULL ptr */) * sizeof(char *);
-    // now copy them strings
-    // null bytes handled by callocz
-    for (int i = 0; i < hash_count; i++) {
-        strcpy(dest, cfgs.config_hashes(i).c_str());
-        res.hashes[i] = dest;
-        dest += strlen(dest) + 1 /* end string null */;
-    }
-
-    return res;
-}
-
-char *generate_chart_configs_updated(size_t *len, const struct chart_config_updated *config_list, int list_size)
-{
-    chart::v1::ChartConfigsUpdated configs;
-    for (int i = 0; i < list_size; i++) {
-        chart::v1::ChartConfigUpdated *config = configs.add_configs();
-        config->set_type(config_list[i].type);
-        if (config_list[i].family)
-            config->set_family(config_list[i].family);
-        config->set_context(config_list[i].context);
-        config->set_title(config_list[i].title);
-        config->set_priority(config_list[i].priority);
-        config->set_plugin(config_list[i].plugin);
-
-        if (config_list[i].module)
-            config->set_module(config_list[i].module);
-
-        switch (config_list[i].chart_type) {
-        case RRDSET_TYPE_LINE:
-            config->set_chart_type(chart::v1::LINE);
-            break;
-        case RRDSET_TYPE_AREA:
-            config->set_chart_type(chart::v1::AREA);
-            break;
-        case RRDSET_TYPE_STACKED:
-            config->set_chart_type(chart::v1::STACKED);
-            break;
-        default:
-            return NULL;
-        }
-
-        config->set_units(config_list[i].units);
-        config->set_config_hash(config_list[i].config_hash);
-    }
-
-    *len = PROTO_COMPAT_MSG_SIZE(configs);
-    char *bin = (char*)mallocz(*len);
-    configs.SerializeToArray(bin, *len);
-
-    return bin;
-}
diff --git a/aclk/schema-wrappers/chart_config.h b/aclk/schema-wrappers/chart_config.h
deleted file mode 100644
index f08f76b61..000000000
--- a/aclk/schema-wrappers/chart_config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#ifndef ACLK_SCHEMA_WRAPPER_CHART_CONFIG_H
-#define ACLK_SCHEMA_WRAPPER_CHART_CONFIG_H
-
-#include <stdlib.h>
-
-#include "database/rrd.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct update_chart_config {
-    char *claim_id;
-    char *node_id;
-    char **hashes;
-};
-
-enum chart_config_chart_type {
-    LINE,
-    AREA,
-    STACKED
-};
-
-struct chart_config_updated {
-    char *type;
-    char *family;
-    char *context;
-    char *title;
-    uint64_t priority;
-    char *plugin;
-    char *module;
-    RRDSET_TYPE chart_type;
-    char *units;
-    char *config_hash;
-};
-
-void destroy_update_chart_config(struct update_chart_config *cfg);
-void destroy_chart_config_updated(struct chart_config_updated *cfg);
-
-struct update_chart_config parse_update_chart_config(const char *data, size_t len);
-
-char *generate_chart_configs_updated(size_t *len, const struct chart_config_updated *config_list, int list_size);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ACLK_SCHEMA_WRAPPER_CHART_CONFIG_H */
diff --git a/aclk/schema-wrappers/chart_stream.cc b/aclk/schema-wrappers/chart_stream.cc
deleted file mode 100644
index 54c940758..000000000
--- a/aclk/schema-wrappers/chart_stream.cc
+++ /dev/null
@@ -1,337 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "aclk/aclk_util.h"
-
-#include "proto/chart/v1/stream.pb.h"
-#include "chart_stream.h"
-
-#include "schema_wrapper_utils.h"
-
-#include <sys/time.h>
-#include <stdlib.h>
-
-stream_charts_and_dims_t parse_stream_charts_and_dims(const char *data, size_t len)
-{
-    chart::v1::StreamChartsAndDimensions msg;
-    stream_charts_and_dims_t res;
-    memset(&res, 0, sizeof(res));
-
-    if (!msg.ParseFromArray(data, len))
-        return res;
-
-    res.node_id = strdup(msg.node_id().c_str());
-    res.claim_id = strdup(msg.claim_id().c_str());
-    res.seq_id = msg.sequence_id();
-    res.batch_id = msg.batch_id();
-    set_timeval_from_google_timestamp(msg.seq_id_created_at(), &res.seq_id_created_at);
-
-    return res;
-}
-
-chart_and_dim_ack_t parse_chart_and_dimensions_ack(const char *data, size_t len)
-{
-    chart::v1::ChartsAndDimensionsAck msg;
-    chart_and_dim_ack_t res = { .claim_id = NULL, .node_id = NULL, .last_seq_id = 0 };
-
-    if (!msg.ParseFromArray(data, len))
-        return res;
-
-    res.node_id = strdup(msg.node_id().c_str());
-    res.claim_id = strdup(msg.claim_id().c_str());
-    res.last_seq_id = msg.last_sequence_id();
-
-    return res;
-}
-
-char *generate_reset_chart_messages(size_t *len, chart_reset_t reset)
-{
-    chart::v1::ResetChartMessages msg;
-
-    msg.set_claim_id(reset.claim_id);
-    msg.set_node_id(reset.node_id);
-    switch (reset.reason) {
-        case DB_EMPTY:
-            msg.set_reason(chart::v1::ResetReason::DB_EMPTY);
-            break;
-        case SEQ_ID_NOT_EXISTS:
-            msg.set_reason(chart::v1::ResetReason::SEQ_ID_NOT_EXISTS);
-            break;
-        case TIMESTAMP_MISMATCH:
-            msg.set_reason(chart::v1::ResetReason::TIMESTAMP_MISMATCH);
-            break;
-        default:
-            return NULL;
-    }
-
-    *len = PROTO_COMPAT_MSG_SIZE(msg);
-    char *bin = (char*)malloc(*len);
-    if (bin)
-        msg.SerializeToArray(bin, *len);
-
-    return bin;
-}
-
-void chart_instance_updated_destroy(struct chart_instance_updated *instance)
-{
-    freez((char*)instance->id);
-    freez((char*)instance->claim_id);
-
-    rrdlabels_destroy(instance->chart_labels);
-
-    freez((char*)instance->config_hash);
-}
-
-static int set_chart_instance_updated(chart::v1::ChartInstanceUpdated *chart, const struct chart_instance_updated *update)
-{
-    google::protobuf::Map<std::string, std::string> *map;
-    aclk_lib::v1::ACLKMessagePosition *pos;
-
-    chart->set_id(update->id);
-    chart->set_claim_id(update->claim_id);
-    chart->set_node_id(update->node_id);
-    chart->set_name(update->name);
-
-    map = chart->mutable_chart_labels();
-    rrdlabels_walkthrough_read(update->chart_labels, label_add_to_map_callback, map);
-
-    switch (update->memory_mode) {
-    case RRD_MEMORY_MODE_NONE:
-        chart->set_memory_mode(chart::v1::NONE);
-        break;
-    case RRD_MEMORY_MODE_RAM:
-        chart->set_memory_mode(chart::v1::RAM);
-        break;
-    case RRD_MEMORY_MODE_MAP:
-        chart->set_memory_mode(chart::v1::MAP);
-        break;
-    case RRD_MEMORY_MODE_SAVE:
-        chart->set_memory_mode(chart::v1::SAVE);
-        break;
-    case RRD_MEMORY_MODE_ALLOC:
-        chart->set_memory_mode(chart::v1::ALLOC);
-        break;
-    case RRD_MEMORY_MODE_DBENGINE:
-        chart->set_memory_mode(chart::v1::DB_ENGINE);
-        break;
-    default:
-        return 1;
-        break;
-    }
-
-    chart->set_update_every_interval(update->update_every);
-    chart->set_config_hash(update->config_hash);
-
-    pos = chart->mutable_position();
-    pos->set_sequence_id(update->position.sequence_id);
-    pos->set_previous_sequence_id(update->position.previous_sequence_id);
-    set_google_timestamp_from_timeval(update->position.seq_id_creation_time, pos->mutable_seq_id_created_at());
-
-    return 0;
-}
-
-static int set_chart_dim_updated(chart::v1::ChartDimensionUpdated *dim, const struct chart_dimension_updated *c_dim)
-{
-    aclk_lib::v1::ACLKMessagePosition *pos;
-
-    dim->set_id(c_dim->id);
-    dim->set_chart_id(c_dim->chart_id);
-    dim->set_node_id(c_dim->node_id);
-    dim->set_claim_id(c_dim->claim_id);
-    dim->set_name(c_dim->name);
-
-    set_google_timestamp_from_timeval(c_dim->created_at, dim->mutable_created_at());
-    set_google_timestamp_from_timeval(c_dim->last_timestamp, dim->mutable_last_timestamp());
-
-    pos = dim->mutable_position();
-    pos->set_sequence_id(c_dim->position.sequence_id);
-    pos->set_previous_sequence_id(c_dim->position.previous_sequence_id);
-    set_google_timestamp_from_timeval(c_dim->position.seq_id_creation_time, pos->mutable_seq_id_created_at());
-
-    return 0;
-}
-
-char *generate_charts_and_dimensions_updated(size_t *len, char **payloads, size_t *payload_sizes, int *is_dim, struct aclk_message_position *new_positions, uint64_t batch_id)
-{
-    chart::v1::ChartsAndDimensionsUpdated msg;
-    chart::v1::ChartInstanceUpdated db_chart;
-    chart::v1::ChartDimensionUpdated db_dim;
-    aclk_lib::v1::ACLKMessagePosition *pos;
-
-    msg.set_batch_id(batch_id);
-
-    for (int i = 0; payloads[i]; i++) {
-        if (is_dim[i]) {
-            if (!db_dim.ParseFromArray(payloads[i], payload_sizes[i])) {
-                error("[ACLK] Could not parse chart::v1::chart_dimension_updated");
-                return NULL;
-            }
-
-            pos = db_dim.mutable_position();
-            pos->set_sequence_id(new_positions[i].sequence_id);
-            pos->set_previous_sequence_id(new_positions[i].previous_sequence_id);
-            set_google_timestamp_from_timeval(new_positions[i].seq_id_creation_time, pos->mutable_seq_id_created_at());
-
-            chart::v1::ChartDimensionUpdated *dim = msg.add_dimensions();
-            *dim = db_dim;
-        } else {
-            if (!db_chart.ParseFromArray(payloads[i], payload_sizes[i])) {
-                error("[ACLK] Could not parse chart::v1::ChartInstanceUpdated");
-                return NULL;
-            }
-
-            pos = db_chart.mutable_position();
-            pos->set_sequence_id(new_positions[i].sequence_id);
-            pos->set_previous_sequence_id(new_positions[i].previous_sequence_id);
-            set_google_timestamp_from_timeval(new_positions[i].seq_id_creation_time, pos->mutable_seq_id_created_at());
-
-            chart::v1::ChartInstanceUpdated *chart = msg.add_charts();
-            *chart = db_chart;
-        }
-    }
-
-    *len = PROTO_COMPAT_MSG_SIZE(msg);
-    char *bin = (char*)mallocz(*len);
-    msg.SerializeToArray(bin, *len);
-
-    return bin;
-}
-
-char *generate_charts_updated(size_t *len, char **payloads, size_t *payload_sizes, struct aclk_message_position *new_positions)
-{
-    chart::v1::ChartsAndDimensionsUpdated msg;
-
-    msg.set_batch_id(chart_batch_id);
-
-    for (int i = 0; payloads[i]; i++) {
-        chart::v1::ChartInstanceUpdated db_msg;
-        chart::v1::ChartInstanceUpdated *chart;
-        aclk_lib::v1::ACLKMessagePosition *pos;
-
-        if (!db_msg.ParseFromArray(payloads[i], payload_sizes[i])) {
-            error("[ACLK] Could not parse chart::v1::ChartInstanceUpdated");
-            return NULL;
-        }
-
-        pos = db_msg.mutable_position();
-        pos->set_sequence_id(new_positions[i].sequence_id);
-        pos->set_previous_sequence_id(new_positions[i].previous_sequence_id);
-        set_google_timestamp_from_timeval(new_positions[i].seq_id_creation_time, pos->mutable_seq_id_created_at());
-
-        chart = msg.add_charts();
-        *chart = db_msg;
-    }
-
-    *len = PROTO_COMPAT_MSG_SIZE(msg);
-    char *bin = (char*)mallocz(*len);
-    msg.SerializeToArray(bin, *len);
-
-    return bin;
-}
-
-char *generate_chart_dimensions_updated(size_t *len, char **payloads, size_t *payload_sizes, struct aclk_message_position *new_positions)
-{
-    chart::v1::ChartsAndDimensionsUpdated msg;
-
-    msg.set_batch_id(chart_batch_id);
-
-    for (int i = 0; payloads[i]; i++) {
-        chart::v1::ChartDimensionUpdated db_msg;
-        chart::v1::ChartDimensionUpdated *dim;
-        aclk_lib::v1::ACLKMessagePosition *pos;
-
-        if (!db_msg.ParseFromArray(payloads[i], payload_sizes[i])) {
-            error("[ACLK] Could not parse chart::v1::chart_dimension_updated");
-            return NULL;
-        }
-
-        pos = db_msg.mutable_position();
-        pos->set_sequence_id(new_positions[i].sequence_id);
-        pos->set_previous_sequence_id(new_positions[i].previous_sequence_id);
-        set_google_timestamp_from_timeval(new_positions[i].seq_id_creation_time, pos->mutable_seq_id_created_at());
-
-        dim = msg.add_dimensions();
-        *dim = db_msg;
-    }
-
-    *len = PROTO_COMPAT_MSG_SIZE(msg);
-    char *bin = (char*)mallocz(*len);
-    msg.SerializeToArray(bin, *len);
-
-    return bin;
-}
-
-char *generate_chart_instance_updated(size_t *len, const struct chart_instance_updated *update)
-{
-    chart::v1::ChartInstanceUpdated *chart = new chart::v1::ChartInstanceUpdated();
-
-    if (set_chart_instance_updated(chart, update))
-        return NULL;
-
-    *len = PROTO_COMPAT_MSG_SIZE_PTR(chart);
-    char *bin = (char*)mallocz(*len);
-    chart->SerializeToArray(bin, *len);
-
-    delete chart;
-    return bin;
-}
-
-char *generate_chart_dimension_updated(size_t *len, const struct chart_dimension_updated *dim)
-{
-    chart::v1::ChartDimensionUpdated *proto_dim = new chart::v1::ChartDimensionUpdated();
-
-    if (set_chart_dim_updated(proto_dim, dim))
-        return NULL;
-
-    *len = PROTO_COMPAT_MSG_SIZE_PTR(proto_dim);
-    char *bin = (char*)mallocz(*len);
-    proto_dim->SerializeToArray(bin, *len);
-
-    delete proto_dim;
-    return bin;
-}
-
-using namespace google::protobuf;
-
-char *generate_retention_updated(size_t *len, struct retention_updated *data)
-{
-    chart::v1::RetentionUpdated msg;
-
-    msg.set_claim_id(data->claim_id);
-    msg.set_node_id(data->node_id);
-
-    switch (data->memory_mode) {
-    case RRD_MEMORY_MODE_NONE:
-        msg.set_memory_mode(chart::v1::NONE);
-        break;
-    case RRD_MEMORY_MODE_RAM:
-        msg.set_memory_mode(chart::v1::RAM);
-        break;
-    case RRD_MEMORY_MODE_MAP:
-        msg.set_memory_mode(chart::v1::MAP);
-        break;
-    case RRD_MEMORY_MODE_SAVE:
-        msg.set_memory_mode(chart::v1::SAVE);
-        break;
-    case RRD_MEMORY_MODE_ALLOC:
-        msg.set_memory_mode(chart::v1::ALLOC);
-        break;
-    case RRD_MEMORY_MODE_DBENGINE:
-        msg.set_memory_mode(chart::v1::DB_ENGINE);
-        break;
-    default:
-        return NULL;
-    }
-
-    for (int i = 0; i < data->interval_duration_count; i++) {
-        Map<uint32, uint32> *map = msg.mutable_interval_durations();
-        map->insert({data->interval_durations[i].update_every, data->interval_durations[i].retention});
-    }
-
-    set_google_timestamp_from_timeval(data->rotation_timestamp, msg.mutable_rotation_timestamp());
-
-    *len = PROTO_COMPAT_MSG_SIZE(msg);
-    char *bin = (char*)mallocz(*len);
-    msg.SerializeToArray(bin, *len);
-
-    return bin;
-}
diff --git a/aclk/schema-wrappers/chart_stream.h b/aclk/schema-wrappers/chart_stream.h
deleted file mode 100644
index 904866868..000000000
--- a/aclk/schema-wrappers/chart_stream.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#ifndef ACLK_SCHEMA_WRAPPER_CHART_STREAM_H
-#define ACLK_SCHEMA_WRAPPER_CHART_STREAM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "database/rrd.h"
-
-typedef struct {
-    char* claim_id;
-    char* node_id;
-
-    uint64_t seq_id;
-    uint64_t batch_id;
-
-    struct timeval seq_id_created_at;
-} stream_charts_and_dims_t;
-
-stream_charts_and_dims_t parse_stream_charts_and_dims(const char *data, size_t len);
-
-typedef struct {
-    char* claim_id;
-    char* node_id;
-
-    uint64_t last_seq_id;
-} chart_and_dim_ack_t;
-
-chart_and_dim_ack_t parse_chart_and_dimensions_ack(const char *data, size_t len);
-
-enum chart_reset_reason {
-    DB_EMPTY,
-    SEQ_ID_NOT_EXISTS,
-    TIMESTAMP_MISMATCH
-};
-
-typedef struct {
-    char *claim_id;
-    char *node_id;
-
-    enum chart_reset_reason reason;
-} chart_reset_t;
-
-char *generate_reset_chart_messages(size_t *len, const chart_reset_t reset);
-
-struct aclk_message_position {
-    uint64_t sequence_id;
-    struct timeval seq_id_creation_time;
-    uint64_t previous_sequence_id;
-};
-
-struct chart_instance_updated {
-    const char *id;
-    const char *claim_id;
-    const char *node_id;
-    const char *name;
-
-    DICTIONARY *chart_labels;
-
-    RRD_MEMORY_MODE memory_mode;
-
-    uint32_t update_every;
-    const char * config_hash;
-
-    struct aclk_message_position position;
-};
-
-void chart_instance_updated_destroy(struct chart_instance_updated *instance);
-
-struct chart_dimension_updated {
-    const char *id;
-    const char *chart_id;
-    const char *node_id;
-    const char *claim_id;
-    const char *name;
-    struct timeval created_at;
-    struct timeval last_timestamp;
-    struct aclk_message_position position;
-};
-
-typedef struct {
-    struct chart_instance_updated *charts;
-    uint16_t chart_count;
-
-    struct chart_dimension_updated *dims;
-    uint16_t dim_count;
-
-    uint64_t batch_id;
-} charts_and_dims_updated_t;
-
-struct interval_duration {
-    uint32_t update_every;
-    uint32_t retention;
-};
-
-struct retention_updated {
-    char *claim_id;
-    char *node_id;
-
-    RRD_MEMORY_MODE memory_mode;
-
-    struct interval_duration *interval_durations;
-    int interval_duration_count;
-
-    struct timeval rotation_timestamp;
-};
-
-char *generate_charts_and_dimensions_updated(size_t *len, char **payloads, size_t *payload_sizes, int *is_dim, struct aclk_message_position *new_positions, uint64_t batch_id);
-char *generate_charts_updated(size_t *len, char **payloads, size_t *payload_sizes, struct aclk_message_position *new_positions);
-char *generate_chart_instance_updated(size_t *len, const struct chart_instance_updated *update);
-char *generate_chart_dimensions_updated(size_t *len, char **payloads, size_t *payload_sizes, struct aclk_message_position *new_positions);
-char *generate_chart_dimension_updated(size_t *len, const struct chart_dimension_updated *dim);
-char *generate_retention_updated(size_t *len, struct retention_updated *data);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ACLK_SCHEMA_WRAPPER_CHART_STREAM_H */
diff --git a/aclk/schema-wrappers/connection.cc b/aclk/schema-wrappers/connection.cc
index 7520a4600..20b40ece2 100644
--- a/aclk/schema-wrappers/connection.cc
+++ b/aclk/schema-wrappers/connection.cc
@@ -29,7 +29,7 @@ char *generate_update_agent_connection(size_t *len, const update_agent_connectio
     timestamp->set_nanos(tv.tv_usec * 1000);
 
     if (data->capabilities) {
-        struct capability *capa = data->capabilities;
+        const struct capability *capa = data->capabilities;
         while (capa->name) {
             aclk_lib::v1::Capability *proto_capa = connupd.add_capabilities();
             capability_set(proto_capa, capa);
@@ -38,7 +38,7 @@ char *generate_update_agent_connection(size_t *len, const update_agent_connectio
     }
 
     *len = PROTO_COMPAT_MSG_SIZE(connupd);
-    char *msg = (char*)malloc(*len);
+    char *msg = (char*)mallocz(*len);
     if (msg)
         connupd.SerializeToArray(msg, *len);
 
@@ -52,7 +52,7 @@ struct disconnect_cmd *parse_disconnect_cmd(const char *data, size_t len) {
     if (!req.ParseFromArray(data, len))
         return NULL;
 
-    res = (struct disconnect_cmd *)calloc(1, sizeof(struct disconnect_cmd));
+    res = (struct disconnect_cmd *)callocz(1, sizeof(struct disconnect_cmd));
 
     if (!res)
         return NULL;
@@ -61,9 +61,9 @@ struct disconnect_cmd *parse_disconnect_cmd(const char *data, size_t len) {
     res->permaban = req.permaban();
     res->error_code = req.error_code();
     if (req.error_description().c_str()) {
-        res->error_description = strdup(req.error_description().c_str());
+        res->error_description = strdupz(req.error_description().c_str());
         if (!res->error_description) {
-            free(res);
+            freez(res);
             return NULL;
         }
     }
diff --git a/aclk/schema-wrappers/connection.h b/aclk/schema-wrappers/connection.h
index fcbe6bd59..0356c7d78 100644
--- a/aclk/schema-wrappers/connection.h
+++ b/aclk/schema-wrappers/connection.h
@@ -17,7 +17,7 @@ typedef struct {
 
     unsigned int lwt:1;
 
-    struct capability *capabilities;
+    const struct capability *capabilities;
 
 // TODO in future optional fields
 // > 15 optional fields:
diff --git a/aclk/schema-wrappers/node_connection.cc b/aclk/schema-wrappers/node_connection.cc
index a6ca8ef98..db1fa6449 100644
--- a/aclk/schema-wrappers/node_connection.cc
+++ b/aclk/schema-wrappers/node_connection.cc
@@ -29,7 +29,7 @@ char *generate_node_instance_connection(size_t *len, const node_instance_connect
     timestamp->set_nanos(tv.tv_usec * 1000);
 
     if (data->capabilities) {
-        struct capability *capa = data->capabilities;
+        const struct capability *capa = data->capabilities;
         while (capa->name) {
             aclk_lib::v1::Capability *proto_capa = msg.add_capabilities();
             capability_set(proto_capa, capa);
@@ -38,7 +38,7 @@ char *generate_node_instance_connection(size_t *len, const node_instance_connect
     }
 
     *len = PROTO_COMPAT_MSG_SIZE(msg);
-    char *bin = (char*)malloc(*len);
+    char *bin = (char*)mallocz(*len);
     if (bin)
         msg.SerializeToArray(bin, *len);
 
diff --git a/aclk/schema-wrappers/node_connection.h b/aclk/schema-wrappers/node_connection.h
index c27729d15..dac0d8fe0 100644
--- a/aclk/schema-wrappers/node_connection.h
+++ b/aclk/schema-wrappers/node_connection.h
@@ -19,7 +19,7 @@ typedef struct {
     int64_t session_id;
 
     int32_t hops;
-    struct capability *capabilities;
+    const struct capability *capabilities;
 } node_instance_connection_t;
 
 char *generate_node_instance_connection(size_t *len, const node_instance_connection_t *data);
diff --git a/aclk/schema-wrappers/node_creation.cc b/aclk/schema-wrappers/node_creation.cc
index c696bb27b..5ad25b7e5 100644
--- a/aclk/schema-wrappers/node_creation.cc
+++ b/aclk/schema-wrappers/node_creation.cc
@@ -18,7 +18,7 @@ char *generate_node_instance_creation(size_t *len, const node_instance_creation_
     msg.set_hops(data->hops);
 
     *len = PROTO_COMPAT_MSG_SIZE(msg);
-    char *bin = (char*)malloc(*len);
+    char *bin = (char*)mallocz(*len);
     if (bin)
         msg.SerializeToArray(bin, *len);
 
@@ -33,7 +33,7 @@ node_instance_creation_result_t parse_create_node_instance_result(const char *da
     if (!msg.ParseFromArray(data, len))
         return res;
 
-    res.node_id = strdup(msg.node_id().c_str());
-    res.machine_guid = strdup(msg.machine_guid().c_str());
+    res.node_id = strdupz(msg.node_id().c_str());
+    res.machine_guid = strdupz(msg.machine_guid().c_str());
     return res;
 }
diff --git a/aclk/schema-wrappers/node_creation.h b/aclk/schema-wrappers/node_creation.h
index 190ccb4d6..7a8c7f7c7 100644
--- a/aclk/schema-wrappers/node_creation.h
+++ b/aclk/schema-wrappers/node_creation.h
@@ -8,9 +8,9 @@ extern "C" {
 #endif
 
 typedef struct {
-    char* claim_id;
-    char* machine_guid;
-    char* hostname;
+    const char *claim_id;
+    const char *machine_guid;
+    const char *hostname;
 
     int32_t hops;
 } node_instance_creation_t;
diff --git a/aclk/schema-wrappers/node_info.cc b/aclk/schema-wrappers/node_info.cc
index 2a05ddaba..5e321f688 100644
--- a/aclk/schema-wrappers/node_info.cc
+++ b/aclk/schema-wrappers/node_info.cc
@@ -104,7 +104,7 @@ char *generate_update_node_info_message(size_t *len, struct update_node_info *in
     }
 
     *len = PROTO_COMPAT_MSG_SIZE(msg);
-    char *bin = (char*)malloc(*len);
+    char *bin = (char*)mallocz(*len);
     if (bin)
         msg.SerializeToArray(bin, *len);
 
@@ -128,7 +128,7 @@ char *generate_update_node_collectors_message(size_t *len, struct update_node_co
     dfe_done(colls);
 
     *len = PROTO_COMPAT_MSG_SIZE(msg);
-    char *bin = (char*)malloc(*len);
+    char *bin = (char*)mallocz(*len);
     if (bin)
         msg.SerializeToArray(bin, *len);
 
diff --git a/aclk/schema-wrappers/node_info.h b/aclk/schema-wrappers/node_info.h
index e8ac2d7c6..de4ade78a 100644
--- a/aclk/schema-wrappers/node_info.h
+++ b/aclk/schema-wrappers/node_info.h
@@ -19,41 +19,27 @@ struct machine_learning_info {
 };
 
 struct aclk_node_info {
-    char *name;
-
-    char *os;
-    char *os_name;
-    char *os_version;
-
-    char *kernel_name;
-    char *kernel_version;
-
-    char *architecture;
-
+    const char *name;
+
+    const char *os;
+    const char *os_name;
+    const char *os_version;
+    const char *kernel_name;
+    const char *kernel_version;
+    const char *architecture;
     uint32_t cpus;
-
-    char *cpu_frequency;
-
-    char *memory;
-
-    char *disk_space;
-
-    char *version;
-
-    char *release_channel;
-
-    char *timezone;
-
-    char *virtualization_type;
-
-    char *container_type;
-
-    char *custom_info;
-
-    char *machine_guid;
+    const char *cpu_frequency;
+    const char *memory;
+    const char *disk_space;
+    const char *version;
+    const char *release_channel;
+    const char *timezone;
+    const char *virtualization_type;
+    const char *container_type;
+    const char *custom_info;
+    const char *machine_guid;
 
     DICTIONARY *host_labels_ptr;
-
     struct machine_learning_info ml_info;
 };
 
@@ -72,8 +58,8 @@ struct update_node_info {
 };
 
 struct collector_info {
-    char *module;
-    char *plugin;
+    const char *module;
+    const char *plugin;
 };
 
 struct update_node_collectors {
diff --git a/aclk/schema-wrappers/proto_2_json.cc b/aclk/schema-wrappers/proto_2_json.cc
index 0e473eb6c..8853b2e08 100644
--- a/aclk/schema-wrappers/proto_2_json.cc
+++ b/aclk/schema-wrappers/proto_2_json.cc
@@ -4,8 +4,6 @@
 #include "proto/alarm/v1/config.pb.h"
 #include "proto/alarm/v1/stream.pb.h"
 #include "proto/aclk/v1/lib.pb.h"
-#include "proto/chart/v1/config.pb.h"
-#include "proto/chart/v1/stream.pb.h"
 #include "proto/agent/v1/connection.pb.h"
 #include "proto/agent/v1/disconnect.pb.h"
 #include "proto/nodeinstance/connection/v1/connection.pb.h"
@@ -29,14 +27,6 @@ static google::protobuf::Message *msg_name_to_protomsg(const char *msgname)
         return new nodeinstance::v1::UpdateNodeInstanceConnection;
     if (!strcmp(msgname, "CreateNodeInstance"))
         return new nodeinstance::create::v1::CreateNodeInstance;
-    if (!strcmp(msgname, "ChartsAndDimensionsUpdated"))
-        return new chart::v1::ChartsAndDimensionsUpdated;
-    if (!strcmp(msgname, "ChartConfigsUpdated"))
-        return new chart::v1::ChartConfigsUpdated;
-    if (!strcmp(msgname, "ResetChartMessages"))
-        return new chart::v1::ResetChartMessages;
-    if (!strcmp(msgname, "RetentionUpdated"))
-        return new chart::v1::RetentionUpdated;
     if (!strcmp(msgname, "UpdateNodeInfo"))
         return new nodeinstance::info::v1::UpdateNodeInfo;
     if (!strcmp(msgname, "AlarmLogHealth"))
@@ -59,12 +49,6 @@ static google::protobuf::Message *msg_name_to_protomsg(const char *msgname)
         return new nodeinstance::create::v1::CreateNodeInstanceResult;
     if (!strcmp(msgname, "SendNodeInstances"))
         return new agent::v1::SendNodeInstances;
-    if (!strcmp(msgname, "StreamChartsAndDimensions"))
-        return new chart::v1::StreamChartsAndDimensions;
-    if (!strcmp(msgname, "ChartsAndDimensionsAck"))
-        return new chart::v1::ChartsAndDimensionsAck;
-    if (!strcmp(msgname, "UpdateChartConfigs"))
-        return new chart::v1::UpdateChartConfigs;
     if (!strcmp(msgname, "StartAlarmStreaming"))
         return new alarms::v1::StartAlarmStreaming;
     if (!strcmp(msgname, "SendAlarmLogHealth"))
diff --git a/aclk/schema-wrappers/schema_wrappers.h b/aclk/schema-wrappers/schema_wrappers.h
index 26412cacc..a96f7ea7a 100644
--- a/aclk/schema-wrappers/schema_wrappers.h
+++ b/aclk/schema-wrappers/schema_wrappers.h
@@ -8,8 +8,6 @@
 #include "connection.h"
 #include "node_connection.h"
 #include "node_creation.h"
-#include "chart_config.h"
-#include "chart_stream.h"
 #include "alarm_config.h"
 #include "alarm_stream.h"
 #include "node_info.h"