Skip to content
This repository has been archived by the owner on Nov 22, 2017. It is now read-only.

normalize spaces in metric names #11

Merged
merged 1 commit into from
Feb 2, 2012
Merged

normalize spaces in metric names #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 66 additions & 16 deletions src/write_graphite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,11 @@ static int wg_format_name (char *ret, int ret_len,
const char *ds_name, const char dotchar)
{
int status;
char *n_hostname = 0;
char *n_type_instance = 0;
char *n_hostname = NULL;
char *n_plugin = NULL;
char *n_plugin_instance = NULL;
char *n_type = NULL;
char *n_type_instance = NULL;

assert (plugin != NULL);
assert (type != NULL);
Expand All @@ -354,13 +357,38 @@ static int wg_format_name (char *ret, int ret_len,
return (-1);
}

if ((n_plugin = malloc(strlen(plugin)+1)) == NULL)
{
ERROR ("Unable to allocate memory for normalized plugin buffer");
return (-1);
}

if ((n_type = malloc(strlen(type)+1)) == NULL)
{
ERROR ("Unable to allocate memory for normalized type buffer");
return (-1);
}

if (swap_chars(n_hostname, hostname, '.', dotchar) == -1)
{
ERROR ("Unable to normalize hostname");
return (-1);
}

if (type_instance && type_instance[0] != '\0') {
if (swap_chars(n_plugin, plugin, ' ', '_') == -1)
{
ERROR ("Unable to normalize plugin");
return (-1);
}

if (swap_chars(n_type, type, ' ', '_') == -1)
{
ERROR ("Unable to normalize type");
return (-1);
}

if (type_instance != NULL && type_instance[0] != '\0')
{
if ((n_type_instance = malloc(strlen(type_instance)+1)) == NULL)
{
ERROR ("Unable to allocate memory for normalized datasource name buffer");
Expand All @@ -371,28 +399,47 @@ static int wg_format_name (char *ret, int ret_len,
ERROR ("Unable to normalize datasource name");
return (-1);
}
if (swap_chars(n_type_instance, type_instance, ' ', '_') == -1)
{
ERROR ("Unable to normalize datasource name");
return (-1);
}
}

if (plugin_instance != NULL && plugin_instance[0] != '\0')
{
if ((n_plugin_instance = malloc(strlen(plugin_instance)+1)) == NULL)
{
ERROR ("Unable to allocate memory for normalized plugin instance buffer");
return (-1);
}
if (swap_chars(n_plugin_instance, plugin_instance, ' ', '_') == -1)
{
ERROR ("Unable to normalize datasource name");
return (-1);
}
}

if ((plugin_instance == NULL) || (plugin_instance[0] == '\0'))
if ((n_plugin_instance == NULL) || (n_plugin_instance[0] == '\0'))
{
if ((n_type_instance == NULL) || (n_type_instance[0] == '\0'))
{
if ((ds_name == NULL) || (ds_name[0] == '\0'))
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s",
prefix, n_hostname, postfix, plugin, type);
prefix, n_hostname, postfix, n_plugin, n_type);
else
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s",
prefix, n_hostname, postfix, plugin, type, ds_name);
prefix, n_hostname, postfix, n_plugin, n_type, ds_name);
}
else
{
if ((ds_name == NULL) || (ds_name[0] == '\0'))
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s-%s",
prefix, n_hostname, postfix, plugin, type,
prefix, n_hostname, postfix, n_plugin, n_type,
n_type_instance);
else
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s-%s.%s",
prefix, n_hostname, postfix, plugin, type,
prefix, n_hostname, postfix, n_plugin, n_type,
n_type_instance, ds_name);
}
}
Expand All @@ -402,28 +449,31 @@ static int wg_format_name (char *ret, int ret_len,
{
if ((ds_name == NULL) || (ds_name[0] == '\0'))
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s",
prefix, n_hostname, postfix, plugin,
plugin_instance, type);
prefix, n_hostname, postfix, n_plugin,
n_plugin_instance, n_type);
else
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s.%s",
prefix, n_hostname, postfix, plugin,
plugin_instance, type, ds_name);
prefix, n_hostname, postfix, n_plugin,
n_plugin_instance, n_type, ds_name);
}
else
{
if ((ds_name == NULL) || (ds_name[0] == '\0'))
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s-%s",
prefix, n_hostname, postfix, plugin,
plugin_instance, type, n_type_instance);
prefix, n_hostname, postfix, n_plugin,
n_plugin_instance, n_type, n_type_instance);
else
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s-%s.%s",
prefix, n_hostname, postfix, plugin,
plugin_instance, type, n_type_instance, ds_name);
prefix, n_hostname, postfix, n_plugin,
n_plugin_instance, n_type, n_type_instance, ds_name);
}
}

sfree(n_hostname);
sfree(n_type_instance);
sfree(n_type);
sfree(n_plugin);
sfree(n_plugin_instance);

if ((status < 1) || (status >= ret_len))
return (-1);
Expand Down