Commit Graph

8330 Commits (dede58915db3df1ce0828f1d67455c8ef9af0d52)
 

Author SHA1 Message Date
Chen Chenglong 7b1c374f64 support connect ldap server with starttls (#5969) 9 years ago
bergquist 4edb31723c fix(metrics): ignore datasource proxy requests 9 years ago
bergquist e7b56c6389 tech(metrics): move all request counters into one middleware 9 years ago
Torkel Ödegaard 4a2f2fba73 feat(alerting): show panel specific alert annotations, #5694 9 years ago
bergquist 583790e650 fix(alering): the crocdile turned on me > < 9 years ago
Carl Bergquist 51d2534f6a Merge pull request #5994 from mtanda/prometheus_fix_legend_template 9 years ago
Mitsuhiro Tanda 9d09e5bbd0 (prometheus) fix template variable expansion in legend 9 years ago
bergquist aa80b52c07 feat(alerting): make it possible to skip ssl verification for alerting https requests 9 years ago
bergquist 7b9099ef93 fix(query): requires all that all series are empty to set NoDataFound 9 years ago
Torkel Ödegaard 0ac4ece00d feat(annotations): refactoring annotations srv to typescript, #5990 9 years ago
bergquist 9511f89a22 fix(alerting): fixes bug in query conditions 9 years ago
Torkel Ödegaard 23de094a81 feat(alerting/annotations): fixed broken test 9 years ago
bergquist bec099cd84 tech: remove unused files 9 years ago
Torkel Ödegaard b8081b29fd Merge branch 'master' into grafana-annotations 9 years ago
Torkel Ödegaard d60bd77658 feat(annotations): added support to show grafana stored annotations in graphs, #5982 9 years ago
bergquist 3c9432b7e9 fix(metrics): default updateSince to ms 9 years ago
bergquist acf74cdacc fix(alerting): change execution time to ms 9 years ago
bergquist 5f934e0238 feat(emails): move bg color to main table 9 years ago
bergquist 21c5b543fb feat(profile): hide orgs list when it only contains one org 9 years ago
bergquist 592ae5a39a tests(alerting): fixes broken tests. pointers and stuff 🤷 9 years ago
bergquist 30f36fe2c4 docs(changelog): add note about merging #4718 9 years ago
bergquist f56d45ac56 feat(alerting): include default notifications in alert tab 9 years ago
bergquist c769148701 Merge branch 'emails' 9 years ago
bergquist 62372978e4 style: convert tabs to spaces 9 years ago
bergquist 59cb51dc6f test(emails): update fake data model 9 years ago
bergquist 9595916a5f feat: right align value metrics 9 years ago
bergquist 712061ab4f test(alerting): fixes broken unit tests 9 years ago
bergquist 166df66f66 docs(go): update go dep to 1.6 9 years ago
bergquist f26824049f Merge branch 'master' into emails 9 years ago
bergquist 374016b9b5 Merge branch 'kfitzpatrick-custom-github-style-oauth' 9 years ago
bergquist 10b3ee362c docs(oauth): add generic_auth to docs 9 years ago
bergquist 53dddf1a8f fix(oauth): remove github refs from generic auth 9 years ago
bergquist 3b6820ef03 feat(oauth): create struct for generic oauth and add config values 9 years ago
Torkel Ödegaard 0d083bad14 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 50b41130ca feat(alerting): fixed s3 upload issue, progress on alerting on null/missing data, updated ini package to get the support for line continuations 9 years ago
bergquist d1a7a23c84 test(imageupload): add more specific tests 9 years ago
bergquist 4646723cbb Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth 9 years ago
Torkel Ödegaard fc8f0721cd Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard fbae6abb3c feat(alerting): progress on handling no data in alert query, #5860 9 years ago
bergquist 2e8d5ca519 docs(changelog): add note about updating systemd description 9 years ago
Carl Bergquist a02bef7d94 Merge pull request #5971 from cicku/master 9 years ago
Christopher Meng 6afb456bef Update systemd unit's description to be more understandable 9 years ago
bergquist 04690ca920 feat(alerting): add support for retries 9 years ago
bergquist 0d7a871223 style(alerting): remove blank lines 9 years ago
bergquist 22805ce56b fix(alert_tab): fix broken alert history 9 years ago
bergquist 55b560a4a8 feat(alerting): filter notifications based on severity 9 years ago
Torkel Ödegaard b1ed641d73 fix(graph): fixed issue with duplicate metric calls when doing full page reload of graph in edit/view mode 9 years ago
Torkel Ödegaard 6b17cdbca6 feat(alerting): Save As removes alerts from panels, closes #5965 9 years ago
bergquist 2ca7284a56 tech(notifications): splitt into 3 queries 9 years ago
bergquist c893e5d241 feat(notifications): add support for default notifications 9 years ago