icinga, icinga2 and grafana#323

opentokix wants to merge 2 commits intoopsschool:masteropsschool/curriculum:masterfrom

opentokix:masteropentokix/curriculum:masterCopy head branch name to clipboard