return (0);
} /* int tss2_add_vserver */
-static void tss2_submit_gauge (const char *plugin_instance, const char *type,
+static void tss2_submit_gauge (const char *plugin_instance,
+ const char *type, const char *type_instance,
gauge_t value)
{
/*
vl.values = values;
vl.values_len = 1;
- vl.time = time (NULL);
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
if (plugin_instance != NULL)
sstrncpy (vl.plugin_instance, plugin_instance,
sizeof (vl.plugin_instance));
+
+ sstrncpy (vl.type, type, sizeof (vl.type));
+
+ if (type_instance != NULL)
+ sstrncpy (vl.type_instance, type_instance,
+ sizeof (vl.type_instance));
- plugin_dispatch_values (type, &vl);
+ plugin_dispatch_values (&vl);
} /* void tss2_submit_gauge */
static void tss2_submit_io (const char *plugin_instance, const char *type,
vl.values = values;
vl.values_len = 2;
- vl.time = time (NULL);
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
if (plugin_instance != NULL)
sstrncpy (vl.plugin_instance, plugin_instance,
sizeof (vl.plugin_instance));
-
- plugin_dispatch_values (type, &vl);
+
+ sstrncpy (vl.type, type, sizeof (vl.type));
+
+ plugin_dispatch_values (&vl);
} /* void tss2_submit_gauge */
static void tss2_close_socket (void)
char *buffer_ptr;
buffer_ptr = fgets (buffer, sizeof (buffer), global_read_fh);
+ if (buffer_ptr == NULL)
+ {
+ WARNING ("teamspeak2 plugin: Unexpected EOF received "
+ "from remote host %s:%s.",
+ config_host ? config_host : DEFAULT_HOST,
+ config_port ? config_port : DEFAULT_PORT);
+ }
buffer[sizeof (buffer) - 1] = 0;
if (memcmp ("[TS]\r\n", buffer, 6) != 0)
char response[128];
int status;
- DEBUG("teamspeak2 plugin: Select server %i", vserver->port);
-
/* Send request */
- snprintf (command, sizeof (command), "sel %i\r\n", vserver->port);
- command[sizeof (command) - 1] = 0;
+ ssnprintf (command, sizeof (command), "sel %i\r\n", vserver->port);
status = tss2_send_request (write_fh, command);
if (status != 0)
ERROR ("teamspeak2 plugin: tss2_receive_line failed.");
return (-1);
}
- response[sizeof (response)] = 0;
+ response[sizeof (response) - 1] = 0;
/* Check answer */
- if ((strncmp ("OK", response, 2) == 0)
+ if ((strncasecmp ("OK", response, 2) == 0)
&& ((response[2] == 0)
|| (response[2] == '\n')
|| (response[2] == '\r')))
return (-1);
} /* int tss2_select_vserver */
-static int tss2_vserver_gapl(vserver_list_t *vserver)
+static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
+ gauge_t *ret_value)
{
/*
* Reads the vserver's average packet loss and submits it to collectd.
* Be sure to run the tss2_read_vserver function before calling this so
* the vserver is selected correctly.
*/
- int status;
-
- FILE *read_fh;
- FILE *write_fh;
-
- char plugin_instance[DATA_MAX_NAME_LEN];
-
gauge_t packet_loss = NAN;
+ int status;
- DEBUG("teamspeak2 plugin: Get average packet loss (VServer: %i)", vserver->port);
-
- /* Get the send/receive sockets */
- status = tss2_get_socket (&read_fh, &write_fh);
- if (status != 0)
- {
- ERROR ("teamspeak2 plugin: tss2_get_socket failed.");
- return (-1);
- }
-
status = tss2_send_request (write_fh, "gapl\r\n");
if (status != 0)
{
- ERROR("teamspeak2 plugin: tss2_send_request failed. (gapl)");
+ ERROR("teamspeak2 plugin: tss2_send_request (gapl) failed.");
return (-1);
}
ERROR ("teamspeak2 plugin: tss2_receive_line failed.");
return (-1);
}
- buffer[sizeof (buffer)] = 0;
+ buffer[sizeof (buffer) - 1] = 0;
- if (strncmp ("average_packet_loss=", buffer, 20) == 0)
+ if (strncmp ("average_packet_loss=", buffer,
+ strlen ("average_packet_loss=")) == 0)
{
/* Got average packet loss, now interpret it */
value = &buffer[20];
value = &buffer[20];
- packet_loss = strtod(value, &endptr);
+ packet_loss = strtod (value, &endptr);
if (value == endptr)
{
/* Failed */
- WARNING ("teamspeak2 plugin: Could not read average package loss from string: %s", buffer);
+ WARNING ("teamspeak2 plugin: Could not read average package "
+ "loss from string: %s", buffer);
continue;
}
}
- else if (strncmp ("OK", buffer, 2) == 0)
+ else if (strncasecmp ("OK", buffer, 2) == 0)
{
break;
}
- else if(strncasecmp ("ERROR", buffer, 5) == 0)
+ else if (strncasecmp ("ERROR", buffer, 5) == 0)
{
ERROR ("teamspeak2 plugin: Server returned an error: %s", buffer);
return (-1);
}
}
- if (packet_loss != NAN)
- {
- snprintf (plugin_instance, sizeof (plugin_instance), "vserver%i",
- vserver->port);
- plugin_instance[sizeof (plugin_instance) - 1] = 0;
-
- tss2_submit_gauge (plugin_instance, "percent", packet_loss);
- }
- else
- {
- return (-1);
- }
-
+ *ret_value = packet_loss;
return (0);
} /* int tss2_vserver_gapl */
int status;
gauge_t users = NAN;
+ gauge_t channels = NAN;
+ gauge_t servers = NAN;
counter_t rx_octets = 0;
counter_t tx_octets = 0;
counter_t rx_packets = 0;
counter_t tx_packets = 0;
+ gauge_t packet_loss = NAN;
int valid = 0;
char plugin_instance[DATA_MAX_NAME_LEN];
if (vserver == NULL)
{
/* Request global information */
- DEBUG("teamspeak2 plugin: Read global server information");
-
memset (plugin_instance, 0, sizeof (plugin_instance));
status = tss2_send_request (write_fh, "gi\r\n");
else
{
/* Request server information */
- DEBUG("teamspeak2 plugin: Read vserver's %i information!", vserver->port);
-
- snprintf (plugin_instance, sizeof (plugin_instance), "vserver%i",
+ ssnprintf (plugin_instance, sizeof (plugin_instance), "vserver%i",
vserver->port);
- plugin_instance[sizeof (plugin_instance) - 1] = 0;
/* Select the server */
status = tss2_select_vserver (read_fh, write_fh, vserver);
break;
}
- if (strncmp ("ERROR", buffer, 5) == 0)
+ if (strncasecmp ("ERROR", buffer, 5) == 0)
{
ERROR ("teamspeak2 plugin: Server returned an error: %s",
buffer);
break;
}
- else if (strncmp ("OK", buffer, 2) == 0)
+ else if (strncasecmp ("OK", buffer, 2) == 0)
{
break;
}
value++;
/* Check for known key and save the given value */
+ /* global info: users_online,
+ * server info: currentusers. */
if ((strcmp ("currentusers", key) == 0)
|| (strcmp ("users_online", key) == 0))
{
if (value != endptr)
valid |= 0x01;
}
+ /* global info: channels,
+ * server info: currentchannels. */
+ else if ((strcmp ("currentchannels", key) == 0)
+ || (strcmp ("channels", key) == 0))
+ {
+ channels = strtod (value, &endptr);
+ if (value != endptr)
+ valid |= 0x40;
+ }
+ /* global only */
+ else if (strcmp ("servers", key) == 0)
+ {
+ servers = strtod (value, &endptr);
+ if (value != endptr)
+ valid |= 0x80;
+ }
else if (strcmp ("bytesreceived", key) == 0)
{
rx_octets = strtoll (value, &endptr, 0);
}
} /* while (42) */
+ /* Collect vserver packet loss rates only if the loop above did not exit
+ * with an error. */
+ if ((status == 0) && (vserver != NULL))
+ {
+ status = tss2_vserver_gapl (read_fh, write_fh, &packet_loss);
+ if (status == 0)
+ {
+ valid |= 0x20;
+ }
+ else
+ {
+ WARNING ("teamspeak2 plugin: Reading package loss "
+ "for vserver %i failed.", vserver->port);
+ }
+ }
+
if ((valid & 0x01) == 0x01)
- tss2_submit_gauge (plugin_instance, "users", users);
+ tss2_submit_gauge (plugin_instance, "users", NULL, users);
if ((valid & 0x06) == 0x06)
tss2_submit_io (plugin_instance, "io_octets", rx_octets, tx_octets);
if ((valid & 0x18) == 0x18)
tss2_submit_io (plugin_instance, "io_packets", rx_packets, tx_packets);
+ if ((valid & 0x20) == 0x20)
+ tss2_submit_gauge (plugin_instance, "percent", "packet_loss", packet_loss);
+
+ if ((valid & 0x40) == 0x40)
+ tss2_submit_gauge (plugin_instance, "gauge", "channels", channels);
+
+ if ((valid & 0x80) == 0x80)
+ tss2_submit_gauge (plugin_instance, "gauge", "servers", servers);
+
if (valid == 0)
return (-1);
return (0);
int success = 0;
int status;
- DEBUG("teamspeak2 plugin: Poll everything");
-
/* Handle global server variables */
status = tss2_read_vserver (NULL);
if (status == 0)
"for vserver %i failed.", vserver->port);
continue;
}
-
- status = tss2_vserver_gapl (vserver);
- if (status != 0)
- {
- WARNING ("teamspeak2 plugin: Reading package loss "
- "for vserver %i failed.", vserver->port);
- }
}
- DEBUG("teamspeak2 plugin: Poll done");
if (success == 0)
return (-1);
projects / collectd.git / blobdiff