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.

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

icinga2x: Integrate Icinga Web 2 Grafana module w/ Graphite #62

Merged
merged 6 commits into from Apr 23, 2017

Conversation

dnsmichi
Copy link
Contributor

fixes #51

@dnsmichi dnsmichi merged commit f8b5fac into master Apr 23, 2017
@dnsmichi dnsmichi deleted the feature/icingaweb2-grafana-graphite branch April 23, 2017 11:55
dnsmichi pushed a commit that referenced this pull request Apr 24, 2017
3593fd7d5 [blacksmith] Bump version to 0.8.1-rc0
6684f1c1f Merge pull request #168 from bastelfreak/rel080
e7915e295 release 0.8.0
c0b6d24f5 Merge pull request #163 from voxpupuli/modulesync
83e323cfd modulesync 0.16.7
ee985ecbe [blacksmith] Bump version to 0.7.2-rc0
4693841eb Merge pull request #160 from vinzent/release_0_7_1
a7f1de864 Release 0.7.1
d134e73b3 Merge pull request #159 from vinzent/fix_selinux_fact_usage
c607c0966 Fix usage of non-existent $::selinux_enabled fact
7e0514f4d Enable spec tests to delete selinux facts
22580ff62 Merge pull request #158 from vinzent/module_syncversion_param_undef_default
53c894672 Update selinux::module inline docs to puppet-strings format
140389ffd Default to undef for syncversion parameter in selinux::module
e97c6f5d7 Merge pull request #156 from juniorsysadmin/remove-ruby
25c63c6bf Remove mentions of Ruby requirements in README
4bebdc364 Merge pull request #155 from bastelfreak/rel070
3a38f9bfb release 0.7.0
395eb1179 Merge pull request #140 from traylenator/prefix
bdffc0bc8 Merge pull request #154 from vinzent/remove_fact_756_workaround
b164b7f9c Remove custom fact selinux_custom_policy
e662744ef Merge pull request #134 from kausar007/master
e12fb06cb [blacksmith] Bump version to 0.6.1-rc0
adbf276e6 Merge pull request #152 from voxpupuli/modulesync
0d2600d3c release 0.6.0
22dcb7287 Fix type doc
fa9aa7a3a modulesync 0.16.6
422cd7ff8 Merge pull request #151 from vinzent/issue_18_autorelabel
e37bfe9ce Create /.autorelabel when switching from disabled mode
41a28dcee Merge pull request #145 from vinzent/add_acceptance_tests
5ace474d8 Merge pull request #150 from vinzent/puppet_strings
92b9c24ae Update to puppet-strings doc in selinux class
4bc676fe4 Add acceptance tests
40826b9a5 Merge pull request #144 from juniorsysadmin/pupbump
eee7305d1 Set puppet minimum version_requirement to 3.8.7
adb2c4b44 Merge pull request #143 from voxpupuli/modulesync
5cad07a26 modulesync 0.16.4
f952195d0 Default module prefix now ''
3436c4d15 Merge pull request #138 from traylenator/sl6
2aa5004b0 Merge pull request #139 from voxpupuli/modulesync
f372ac529 modulesync 0.16.3
a05a29afd Fixes #133 Use semange -f 'all files' on RHEL6
a5f64af6b Merge pull request #137 from traylenator/pfacts
e0cfefcff Use rspec-puppet-facts in all places
c20363faf Merge pull request #136 from alexjfisher/ruby1.8
6ea273261 Update README with ruby 1.8 status
a58704be4 add argument variable for selinux::port (#132)
242a0799f Fixes Issue-130 - No rspec for permissive (#131)
4b9bf3853 Fixes Issue-104 - No Hiera support (#128)
c3d5b5480 Merge pull request #127 from voxpupuli/modulesync
c28b2bd67 modulesync 0.15.0
762c3ac60 Merge pull request #126 from logic/master
4257b6ae1 Use selinux-policy-devel on Fedora 25.
722ac9ea5 Merge pull request #124 from dhoppe/readme
fdbc177eb Add missing badges
baf362787 Fix several markdown issues
781ca754a Merge pull request #125 from alexjfisher/rubocop
cc6e4a362 rubocop: fix RSpec/NotToNot
5d66d0a1d rubocop: fix RSpec/ImplicitExpect
f229c266a Merge pull request #123 from dhoppe/modulesync
e4272908e Update based on voxpupuli/modulesync_config 0.14.1
1e5f62dcd Merge pull request #122 from voxpupuli/modulesync
fc347e5dc modulesync 0.13.0
6e2b1b0f4 [blacksmith] Bump version to 0.5.1-rc0
06949693d Merge pull request #120 from bastelfreak/rel050
ca467e5de release 0.5.0
f84bc896f puppet-lint: fix 2sp_soft_tabs
11c195fcb add amazon linux
c13d6947e Merge pull request #111 from bleiva/master
dd55bf0bc Merge pull request #117 from cybercom-finland/cleanups2
05cd61839 fcontext: handle also filetype=false
42bb23a44 use let do when multivalue or when with others
19c0bfd13 spec/defines/selinux_module_spec: use proper source arg
394d2d039 fcontext: check filemodes properly
3a53ab16c exec: use shellquote if parameters are not checked
bcc17dfcd Fixes Issue-108 - restorecon should detect path
bbfb70809 Fixes Issue-105 - fcontext detection with square brackets
e7fff8971 make exec path have always same order
24fb949f7 facter::selinux_custom_policy: do not use external programs to parse
15fde36a5 [blacksmith] Bump version to 0.4.2-rc0
bcf43f32e Merge pull request #116 from voxpupuli/modulesync
4feff8bae release 0.4.1
af29457e7 modulesync 0.12.5
ef6223be4 Merge pull request #113 from cybercom-finland/release_checks-fixes
34dff55ce run tests in relevant version space with CentOS 7
3feb4c63a additional tests to get coverage
dbc84059f rubocop spec fixes
aecf03a68 raise error with some message
d4ea1c622 use ruby 1.9 hash syntax
2ddfcff08 spec: use %r for regexps
a0f6b3a31 move pp files from tests to examples as per release_checks
927e396be update package name for newer os versions
f2e719c2c lint: fix warning about relative modules
69fd8b05b modulesync
7ce4a7d11 Fixing operatingsystem for Amazon Linux
fa54aa75e Merge pull request #103 from jfryman/remove-duplicate-test
c303c99e0 Removes duplicate package test
7e9281730 bump to 0.4.0
bd139e481 Merge branch 'master' of https://github.com/jfryman/puppet-selinux
22f437ec3 Merge pull request #100 from jfryman/toddnni-ensure_policycoreutils
12cb847d6 Merge branch 'master' of https://github.com/jfryman/puppet-selinux into toddnni-ensure_policycoreutils
44881a424 Merge branch 'toddnni-ensure_policycoreutils'
f5f235f45 Merge pull request #99 from Heidistein/master
f25286d7a Merge pull request #92 from toddnni/fix_module_installation_2
63b9b40b1 fix travis build. Sorry, paste error.
f1b2332a4 Add travis build test for recursion
55ee9645e Repair travis build
5a8e66289 Fix: change the regex a bit to accept exact paths. ie dont match '/data/mysqldump' when '/data/mysql' is wanted.
8c193592b Add recursion support for restorecon.
c40de8a49 Merge pull request #98 from crayfishx/feature/restorecon
9f070f4bb Added support for running restorecon after modifying file contexts
940eb46fa Merge pull request #89 from ncsutmf/master
aee8a3b31 Merge pull request #94 from lightoze/master
6e7fef068 Only require module source/content when ensure=present
d6e0875c9 Allow specifying selinux module content
6abdcdfcb Updated to devel package for Fedora 21+
479ad7ed7 Fix tests after module.pp change
c5c9979ce fix tests, ensure_packages sets ensure instead of installed
1ef4d9bc7 Add pp to module path
058a2be29 Fix error where module is reinstalled on every run
2697c24cc Use ensure_packages to install policycoreutils
140bbce31 Switch to devel package for makefile on RHEL7
a1b6df43a Merge pull request #55 from Gilum/master
cfeb9b5b7 Merge pull request #86 from jlambert121/linting
00a9755ab bump module to 0.3.1
58a02733b add more lint checks
2bd83b8a3 Merge pull request #81 from MiamiOH/master
499cb55f4 The parameter 'mode' is declared more than once
5b54825f9 Merge pull request #78 from mhjacks/master
3828497ac Add syncversion parameter
359cda4e9 Merge pull request #77 from Thubo/master
215ded686 Fix Issue #76
a72c9581f bumping metadata.json to 0.3.0
a8d930fd8 Merge pull request #49 from dacron/master
1e04c26ff Added Hiera lookups
3db90fc80 Update README.markdown
98908eb0c Deprecating older ruby/facter/puppet versions.
5cb5bb1f7 Merge pull request #73 from jyaworski/pivot_to_selmodule_selboolean
c7f03ead4 Pivot to internal types for selmodule and selboolean
73389be0a Merge pull request #37 from dlevene1/allow_tcp_and_udp_port
63a517006 If you have the same port allowed on both udp & tcp puppet manifest will fail as you have a duplicate name, this change adds the protocol name into port definition
abb25d3a3 Merge pull request #72 from jyaworski/conditionally_name_manage_package
bad02c5df Allow custom package name and management
0cadea17f Merge pull request #67 from thrnio/default_unmanaged
b078ac4ef Update README to reflect default behavior
20f7ec5a2 Switch default behavior to not manage selinux
491ec7562 Add tests for unmanaged type
4ae52d8f1 Add tests for unmanaged mode
9c155bf11 Rename config_mode spec test so it will get run
9b11e74ff Rename LICENSE.md to LICENSE
592aaf04a Add license
6b7dbaa19 Merge pull request #63 from mld/master
4e64573f4 Whitespace lint fixes
c097c3f52 Merge pull request #62 from ElvenSpellmaker/feature/manage-selinux-type
5a810891a Removes spec stuff.
03e2f3ba8 Remember `minimum` isn't `minimal`!
0b661223d Corrects tests, silly mistake.
993a9e41a Adds tests for the SELinux type.
d1e739c93 Implements SELinux type checking and ensuring.
b8334f2a4 bump module to 0.2.6
09e78fb49 Merge pull request #59 from auspost/fix-module-absent-notify
5794ddeeb Fix for selinux::module absent case failed notify
646bfb83a Merge pull request #54 from jkroepke/feature/lsbmajdistrelease
6b185ee14 Add support for Factor 1.6
061537da0 Fallback to lsbmajdistrelease, if puppet version is < 3.0
d17d139ff Merge pull request #53 from jewnix/patch-1
b1e143944 Add Permissive to puppet-selinux module
b3def280a bump module to 0.2.5
3e57a1219 Merge pull request #46 from belminf/master
cd14d02f1 awk escaping + confine fix
63bd8a69e fix facter issues, link to bug, fixes #27

git-subtree-dir: modules/selinux
git-subtree-split: 3593fd7d52dbe41760224c573a01c361794129f7
dnsmichi pushed a commit that referenced this pull request Nov 28, 2017
33c9f501 Merge pull request #62 from bastelfreak/restore_archlinux_support
86784d62 add rubocop fixes
265f3d1f add rubocop to travis config
64c4fd3d add rubocop config
42a80c7f enhance spec tests
23af1ab5 cleanup repo spec tests
89276366 drop legacy pe option in metadata.json
332756c0 add archlinux to metadata.json
b786441a restore archlinux support
24599ba1 Merge pull request #61 from codylane/devel
439f83f1 fixing lint issues
9540d6f5 adding docker_container_name to nodesets
fad45fda removing more junk from README
c72912ec beaker tests for custom fact
ad61d3c2 adding unit tests for influxdb_version fact
636173bf README cleanup
b42dde5b updates to README and Gemfile
c0e8d1c9 adding meta config section to README.md
98605f7c fixes to README formatting
1329ee05 initial updates to README.md
e2142ca8 change default for reporting-disabled to true
8ba8c079 adding preserver docker image
7e1de55b updates to spec helper
8fab885e initial attempt to fix beaker tests for debian based hosts
15d59c3d bugfix for continuous settings in influxdb.conf
2ebd9c36 unit test for install
64a36c2e unit tests for service
841f568d unit test for apt repo
4e2dbd57 unit tests for yum repo
068938dc fixing repo tests
3b09d754 fixing tests to verify influxdb.conf
a7a4a861 adding $manage_service param
72168a60 rename config rspec-puppet test
33cf8bf3 fixing test coverage for init.pp
7deb8f3c removing useless test for params
c1312751 adding config params to main class
7d50629e more cleanup and somewhat passing tests for init.pp
403ee73c more parameter cleanup, removed realized resource to avoid puppetdb dep
614cd357 updated $influxdb_stdout_log location
565e6b63 more parameter cleanup
3778183b moved server back into the main class to avoid extra namespace
69f894f5 moved and cleaned up install.pp
a521ce99 formating fixes to metadata.json
f683a5c2 adding startup config file to influxdb::config
6485516d cleanup of influxdb::config
53f6fe3a removing stupid include that I put in
7d7a3e63 template cleanup
734ed968 adding new config class and updating template to better handle future changes
93d57a62 adding facter utility to get version of influxdb
352f4861 adding code coverage report
4a2164ef fix lint issues
536a07bb more fixes to get beaker workinga again
1247f165 update Gemfile adding more spec helper stuff for beaker testing
34fe8496 fixes to beaker spec_helper
d3ff5db0 adding log/ to .gitignore
0482a6ee fixing systemd problem for CentOS docker file
28eee777 adding .rspec to make tests look better
e4df2bcb initial commit
76c31ef7 version bump to 4.0.0
0a0182d3 Merge pull request #51 from dhoppe/patch-3
b85f6bc3 Merge pull request #53 from dhoppe/patch-4
7b53d402 Add support for parameter max-series-per-database
afd9d12e fix UDP example
8bcdabaf subscriber template fix (looks like this is a bug in the official ubuntu package
d8bc5009 removed unused config parameters in version 1.0.0+
6b1dcd9c add missing subscriber configuration
8d731275 add missing http configuration
c12b533e add missing coordinator configuration
79ad1361 Fix error messages regarding fact puppetversion
f0946513 added missing changelog
ab526b0e Merge branch 'dnsmichi-master'
634b702d Merge branch 'master' of https://github.com/dnsmichi/golja-influxdb into dnsmichi-master
f6ea360d Merge pull request #45 from lukebigum/master
298219ad influxdb.conf template changes for v1.0

git-subtree-dir: modules/influxdb
git-subtree-split: 33c9f501e98fb8de3f86cfed0756bdba2e4524ce
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Replace PNP with Grafana in Icinga Web 2
1 participant