Skip to content

Ganglia metric lifetime fix #327

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

Open
vscharf wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Ganglia metric lifetime fix #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33fce7f
Fixed usage of ${buildroot} instead of %{buildroot} which breaks rpmb…
Feb 15, 2014
eccf196
Fix bug, which sets the 'DMAX' value of metric to 0 independent of th…
Feb 15, 2014
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
6 changes: 4 additions & 2 deletions specs/ganglia/ganglia.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Summary: Ganglia Distributed Monitoring System
Name: ganglia
Version: 3.1.7
Release: 3%{?dist}
Release: 4%{?dist}
License: BSD
Group: Applications/Internet
URL: http://ganglia.sourceforge.net/
Expand All @@ -14,6 +14,7 @@ Source0: http://dl.sf.net/project/ganglia/ganglia%20monitoring%20core/%{version}
Patch0: diskusage-pcre.patch
Patch1: setuserid-fix.patch
Patch2: diskmetrics.patch
Patch3: gmond-dmax.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root

BuildRequires: apr-devel >= 1
Expand Down Expand Up @@ -103,6 +104,7 @@ programmers can use to build scalable cluster or grid applications
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
## Hey, those shouldn't be executable...
chmod -x lib/*.{h,x}

Expand Down Expand Up @@ -192,7 +194,7 @@ gmond/gmond -t | %{__perl} -pe 's|nobody|ganglia|g' > %{buildroot}%{_sysconfdir}
## Install binaries
%{__make} install DESTDIR="%{buildroot}"
## House cleaning
%{__rm} -f ${buildroot}%{_datadir}/ganglia/{Makefile.am,version.php.in}
%{__rm} -f %{buildroot}%{_datadir}/ganglia/{Makefile.am,version.php.in}

%clean
%{__rm} -rf %{buildroot}
Expand Down
19 changes: 19 additions & 0 deletions specs/ganglia/gmond-dmax.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff -uNr ganglia-3.1.7/gmond/gmond.c ganglia-3.1.7-patch/gmond/gmond.c
--- ganglia-3.1.7/gmond/gmond.c 2010-02-17 12:05:39.000000000 +0100
+++ ganglia-3.1.7-patch/gmond/gmond.c 2014-02-15 15:16:29.000000000 +0100
@@ -1575,13 +1575,14 @@
}

len = apr_snprintf(metricxml, 1024,
- "<METRIC NAME=\"%s\" VAL=\"%s\" TYPE=\"%s\" UNITS=\"%s\" TN=\"%d\" TMAX=\"%d\" DMAX=\"0\" SLOPE=\"%s\">\n",
+ "<METRIC NAME=\"%s\" VAL=\"%s\" TYPE=\"%s\" UNITS=\"%s\" TN=\"%d\" TMAX=\"%d\" DMAX=\"%d\" SLOPE=\"%s\">\n",
metricName,
gmetric_value_to_str(&(val->message_u.v_message)),
data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.type,
data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.units,
(int)((now - val->last_heard_from) / APR_USEC_PER_SEC),
data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.tmax,
+ data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.dmax,
slope_to_cstr(data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.slope));

if (metricName) free(metricName);