Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.6.7 #76

Merged
merged 12 commits into from
Jul 10, 2017
Merged

v0.6.7 #76

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0450b3e
Cstatus fix
jangaraj Jun 22, 2017
5d08503
Cstatus fix
jangaraj Jun 22, 2017
7e3ac90
Remove official support for systemd monitoring
jangaraj Jun 23, 2017
23a232a
vstatus fix
jangaraj Jun 23, 2017
ec80a4d
istatus fix
jangaraj Jun 23, 2017
0f8a2f5
#73, socket query timeout implementation
jangaraj Jun 30, 2017
1c8972e
code format
jangaraj Jul 1, 2017
e0f6409
new item key docker.modver - version of docker module
jangaraj Jul 10, 2017
d8f6108
new item key docker.modver - version of docker module
jangaraj Jul 10, 2017
06304bf
README
jangaraj Jul 10, 2017
1264a4c
Changelog
jangaraj Jul 10, 2017
58fa832
Changelog
jangaraj Jul 10, 2017
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
Prev Previous commit
Next Next commit
vstatus fix
  • Loading branch information
@jangaraj
jangaraj committed Jun 23, 2017
commit 23a232a95af5c21599d84d8bdae491881e5c4d7b
18 changes: 16 additions & 2 deletions src/modules/zabbix_module_docker/zabbix_module_docker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2358,15 +2358,22 @@ int zbx_module_docker_vstatus(AGENT_REQUEST *request, AGENT_RESULT *result)
}

struct zbx_json_parse jp_data, jp_data2;
int count;
jp_data.start = &answer[0];
jp_data.end = &answer[strlen(answer)];

if (SUCCEED == zbx_json_brackets_by_name(&jp_data, "Volumes", &jp_data2)) {
int count = zbx_json_count(&jp_data2);
count = zbx_json_count(&jp_data2);
free((void*) answer);
zabbix_log(LOG_LEVEL_DEBUG, "Count of volumes in %s status: %d", state, count);
SET_UI64_RESULT(result, count);
return SYSINFO_RET_OK;
} else {
free((void*) answer);
count = 0;
zabbix_log(LOG_LEVEL_DEBUG, "Count of volumes in %s status: %d", state, count);
SET_UI64_RESULT(result, count);
return SYSINFO_RET_OK;
}
} else if (strcmp(state, "Dangling") == 0) {
// Dangling
Expand All @@ -2386,12 +2393,19 @@ int zbx_module_docker_vstatus(AGENT_REQUEST *request, AGENT_RESULT *result)
}

struct zbx_json_parse jp_data, jp_data2;
int count;
jp_data.start = &answer[0];
jp_data.end = &answer[strlen(answer)];

if (SUCCEED == zbx_json_brackets_by_name(&jp_data, "Volumes", &jp_data2)) {
int count = zbx_json_count(&jp_data2);
count = zbx_json_count(&jp_data2);
free((void*) answer);
zabbix_log(LOG_LEVEL_DEBUG, "Count of volumes in %s status: %d", state, count);
SET_UI64_RESULT(result, count);
return SYSINFO_RET_OK;
} else {
free((void*) answer);
count = 0;
zabbix_log(LOG_LEVEL_DEBUG, "Count of volumes in %s status: %d", state, count);
SET_UI64_RESULT(result, count);
return SYSINFO_RET_OK;
Expand Down