feature: Add Squid application support #6011

Merged
merged 91 commits into from Mar 3, 2017

Conversation

Projects
None yet
6 participants
@VVelox
Contributor

VVelox commented Feb 26, 2017

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

  • Have you signed the Contributors agreement - please do NOT submit a pull request unless you have (signing the agreement in the same pull request is fine). Your commit message for signing the agreement must appear as per the docs.
  • Have you followed our code guidelines?

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

This requires librenms/librenms-agent#93 .

Also this seems to have slightly got manangled with some of the white cleanup I've been doing.

VVelox and others added some commits Feb 15, 2017

kitsune
*rename it so it can be called via the apps page
*setup the apps page to call it
@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment

VVelox added some commits Feb 28, 2017

...
@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment

VVelox added some commits Feb 28, 2017

@VVelox

This comment has been minimized.

Show comment
Hide comment
@VVelox

VVelox Feb 28, 2017

Contributor

Okay. Stuff that got included in this given improper branching has been cleaned up.

Contributor

VVelox commented Feb 28, 2017

Okay. Stuff that got included in this given improper branching has been cleaned up.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@VVelox

This comment has been minimized.

Show comment
Hide comment
@VVelox

VVelox Feb 28, 2017

Contributor

@murrant as far as I can tell showing all the commits to my clone of this repo since it's inception is the default behavior and made a bit worse in this case by the fact I did the fail2ban and php-fpm stuff in the master of my clone when I initially got started instead of a branch like I've done with stuff since then.

Contributor

VVelox commented Feb 28, 2017

@murrant as far as I can tell showing all the commits to my clone of this repo since it's inception is the default behavior and made a bit worse in this case by the fact I did the fail2ban and php-fpm stuff in the master of my clone when I initially got started instead of a branch like I've done with stuff since then.

@laf laf changed the title from add Squid app to feature: Add Squid application support Mar 1, 2017

+$returned = snmp_walk($device, $oid, $options, $mib);
+
+# cacheCurrentLRUExpiration is returned here, but we don't use it as it would be more work to exclude it from the extend
+list( $MemMaxSize, $SwapMaxSize, $SwapHighWM, $SwapLowWM, $SysPageFaults, $SysNumReads, $MemUsage, $CpuTime, $CpuUsage,

This comment has been minimized.

@laf

laf Mar 1, 2017

Member

Space after list( and also at the end can be removed.

@laf

laf Mar 1, 2017

Member

Space after list( and also at the end can be removed.

@laf

Small comment + can you remove the include of common.inc.php and re-test, shouldn't be needed.

@VVelox

This comment has been minimized.

Show comment
Hide comment
@VVelox

VVelox Mar 1, 2017

Contributor

Removed the need for the extend. Updated the docs and will begin working on updating the poller later.

Contributor

VVelox commented Mar 1, 2017

Removed the need for the extend. Updated the docs and will begin working on updating the poller later.

@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf Mar 2, 2017

Member

Looks good, if you can drop the require 'includes/graphs/common.inc.php'; lines + rebase that would be ace.

Member

laf commented Mar 2, 2017

Looks good, if you can drop the require 'includes/graphs/common.inc.php'; lines + rebase that would be ace.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@VVelox

This comment has been minimized.

Show comment
Hide comment
@VVelox

VVelox Mar 3, 2017

Contributor

Done. :)

Contributor

VVelox commented Mar 3, 2017

Done. :)

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf Mar 3, 2017

Member

Sorry also lowercase the variables as well :(

Member

laf commented Mar 3, 2017

Sorry also lowercase the variables as well :(

@VVelox

This comment has been minimized.

Show comment
Hide comment
@VVelox

VVelox Mar 3, 2017

Contributor

All lower cased and conflicted merged.

Contributor

VVelox commented Mar 3, 2017

All lower cased and conflicted merged.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf Mar 3, 2017

Member

Scrut fix committed, should be good to merge once travis is happy

Member

laf commented Mar 3, 2017

Scrut fix committed, should be good to merge once travis is happy

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

scrutinizer-notifier Mar 3, 2017

The inspection completed: No new issues

The inspection completed: No new issues

@laf laf merged commit ab2043c into librenms:master Mar 3, 2017

2 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@VVelox VVelox deleted the VVelox:Squid branch Mar 4, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment