Moderators: Developers, Moderators
The only changes made are in the script.fmangeant wrote:Hi
thanks for this 2.4 / 2.6 compatible version.
Do I need to re-import the templates, or copying the script is enough ?
Thanks in advance.
I'll second that works great on my gentoo servers, although I modified it to go into /usr/bin as I dont put anything in /usr/local.lnxflocki wrote:Let me be the first to say: I love you!
Code: Select all
function hdOutBlocks()
{
awk ' $1 ~ /[0-9]+/ && $2 ~ /[0-9]+/ && $10 ~ /[0-9]+/ { printf "%.0f\n", $10 * 512 }
$1 ~ /[0-9]+/ && $2 ~ /[0-9]+/ && $10 !~ /[0-9]+/ { printf "%.0f\n", $5 * 512 } ' $PROCFILE
}
function hdInBlocks()
{
awk ' $1 ~ /[0-9]+/ && $2 ~ /[0-9]+/ && $8 ~ /[0-9]+/ { printf "%.0f\n", $6 * 512 }
$1 ~ /[0-9]+/ && $2 ~ /[0-9]+/ && $8 !~ /[0-9]+/ { printf "%.0f\n", $7 * 512 } ' $PROCFILE
}
Yep I know, obviously I took a bit too many shortcuts to support all 3 formats (2.4, 2.6 disks, 2.6 partitions).tadavis wrote:Note - on a 2.6 machine, /proc/diskstats holds both partition performance data, and drive partition data.
This script works fine on partition data, but gives the wrong results on full disk data.
partition data is like sda1, sda2; full disk data is sda.
They are formatted differently..
Code: Select all
# disk reads (input: # of sectors read, output: bytes read)
# assume sectorsize 512
function hdInBlocks()
{
if [ "$MODE" = "linux26" ]; then
# on 2.6 disk stats have 14 fields
# partition stats have 7 fields
# if field 8 exists we assume it's disk stats
# # of read sectors are in field #6 (disks) and #5 (partitions)
awk ' $1 ~ /[0-9]+/ && $2 ~ /[0-9]+/ && $8 ~ /[0-9]+/ { printf "%.0f\n", $6 * 512 }
$1 ~ /[0-9]+/ && $2 ~ /[0-9]+/ && $8 !~ /[0-9]+/ { printf "%.0f\n", $5 * 512 } ' $PROCFILE
else
# on 2.4 both disk and partition stats have 15 fields
# # of read sectors are always in field #7
awk ' $1 ~ /[0-9]+/ && $2 ~ /[0-9]+/ && $8 ~ /[0-9]+/ { printf "%.0f\n", $7 * 512 } ' $PROCFILE
fi
}
# disk writes (input: # of sectors written, output: bytes written)
# assume sectorsize 512
function hdOutBlocks()
{ # # of written sectors are either in field #10 (disks) or #7 (partitions)
if [ "$MODE" = "linux26" ]; then
awk ' $1 ~ /[0-9]+/ && $2 ~ /[0-9]+/ && $8 ~ /[0-9]+/ { printf "%.0f\n", $10 * 512 }
$1 ~ /[0-9]+/ && $2 ~ /[0-9]+/ && $8 !~ /[0-9]+/ { printf "%.0f\n", $7 * 512 } ' $PROCFILE
else
# on 2.4: # of written sectors are always in field #11
awk ' $1 ~ /[0-9]+/ && $2 ~ /[0-9]+/ && $8 ~ /[0-9]+/ { printf "%.0f\n", $11 * 512 } ' $PROCFILE
fi
}
I prefer the kernel's point of view.mikaelf wrote: I think the kernels pov should be used which means I should revert the hdInBlocks / hdOutBlocks..
I understand the ones who already installed it has to reimport the templates but isn't it better to have something you know is correct?
Would someone agree or disagree?
Code: Select all
*** ./net-snmp-5.3.0.1/agent/mibgroup/ucd-snmp/diskio.c.orig Thu Apr 27 18:02:02 2006
--- ./net-snmp-5.3.0.1/agent/mibgroup/ucd-snmp/diskio.c Thu Apr 27 18:05:00 2006
***************
*** 150,161 ****
--- 150,162 ----
{DISKIO_WRITES, ASN_COUNTER, RONLY, var_diskio, 1, {6}},
{DISKIO_LA1, ASN_INTEGER, RONLY, var_diskio, 1, {9}},
{DISKIO_LA5, ASN_INTEGER, RONLY, var_diskio, 1, {10}},
{DISKIO_LA15, ASN_INTEGER, RONLY, var_diskio, 1, {11}},
{DISKIO_NREADX, ASN_COUNTER64, RONLY, var_diskio, 1, {12}},
{DISKIO_NWRITTENX, ASN_COUNTER64, RONLY, var_diskio, 1, {13}},
+ {DISKIO_AQS, ASN_COUNTER, RONLY, var_diskio, 1, {14}},
};
/*
* Define the OID pointer to the top of the mib tree that we're
* registering underneath.
*/
***************
*** 719,731 ****
if (head.length == head.alloc) {
head.alloc += DISK_INCR;
head.indices = (linux_diskio *)realloc(head.indices, head.alloc*sizeof(linux_diskio));
}
pTemp = &head.indices[head.length];
sscanf (buffer, "%d %d", &pTemp->major, &pTemp->minor);
! if (pTemp->minor == 0)
sscanf (buffer, "%d %d %s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu\n",
&pTemp->major, &pTemp->minor, pTemp->name,
&pTemp->rio, &pTemp->rmerge, &pTemp->rsect, &pTemp->ruse,
&pTemp->wio, &pTemp->wmerge, &pTemp->wsect, &pTemp->wuse,
&pTemp->running, &pTemp->use, &pTemp->aveq);
else
--- 720,732 ----
if (head.length == head.alloc) {
head.alloc += DISK_INCR;
head.indices = (linux_diskio *)realloc(head.indices, head.alloc*sizeof(linux_diskio));
}
pTemp = &head.indices[head.length];
sscanf (buffer, "%d %d", &pTemp->major, &pTemp->minor);
! if ((pTemp->minor & 0x3f) == 0)
sscanf (buffer, "%d %d %s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu\n",
&pTemp->major, &pTemp->minor, pTemp->name,
&pTemp->rio, &pTemp->rmerge, &pTemp->rsect, &pTemp->ruse,
&pTemp->wio, &pTemp->wmerge, &pTemp->wsect, &pTemp->wuse,
&pTemp->running, &pTemp->use, &pTemp->aveq);
else
***************
*** 815,826 ****
--- 816,830 ----
case DISKIO_READS:
long_ret = head.indices[indx].rio;
return (u_char *) & long_ret;
case DISKIO_WRITES:
long_ret = head.indices[indx].wio;
return (u_char *) & long_ret;
+ case DISKIO_AQS:
+ long_ret = head.indices[indx].aveq;
+ return (u_char *) & long_ret;
default:
snmp_log(LOG_ERR, "diskio.c: don't know how to handle %d request\n", vp->magic);
}
return NULL;
}
***************
*** 1142,1153 ****
--- 1146,1160 ----
return (u_char *) & c64_ret;
case DISKIO_NWRITTENX:
*var_len = 8;
c64_ret.low = (ps_disk[indx].wblks * ps_disk[indx].bsize) & 0xffffffff;;
c64_ret.high = (ps_disk[indx].wblks * ps_disk[indx].bsize) >> 32;
return (u_char *) & c64_ret;
+ case DISKIO_AQS:
+ long_ret = (signed long) ps_disk[indx].qdepth;
+ return (u_char *) & long_ret;
default:
ERROR_MSG("diskio.c: don't know how to handle this request.");
}
/* return NULL in case of error */
Code: Select all
*** ./net-snmp-5.3.0.1/agent/mibgroup/ucd-snmp/diskio.h.orig Thu Apr 27 18:01:56 2006
--- ./net-snmp-5.3.0.1/agent/mibgroup/ucd-snmp/diskio.h Thu Apr 27 18:03:10 2006
***************
*** 31,38 ****
--- 31,39 ----
#define DISKIO_WRITES 6
#define DISKIO_LA1 9
#define DISKIO_LA5 10
#define DISKIO_LA15 11
#define DISKIO_NREADX 12
#define DISKIO_NWRITTENX 13
+ #define DISKIO_AQS 14
#endif /* _MIBGROUP_DISKIO_H */
mikaelf wrote:
I need an opinion on this:
In my scripts:
hdInBlocks: writes to disk
hdOutBlocks: reads from disk
But in for example vmstat output:
bi: Blocks received from a block device (blocks/s).
bo: Blocks sent to a block device (blocks/s).
So before I "release" this FINAL TESTED version should I revert the in/out logic?
The way it is now confuses me. Mainly because I'm so used to the kernel point of view that vmstat has.
........
Would someone agree or disagree?
I have been looking for something like this template for a long time.Users browsing this forum: No registered users and 1 guest