IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
15,627 Commits 1,119 Branches 715 Tags
7b06800295189343bb61e6ef56cebe70056cc23b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist 861af4cb97 Improve extensions build. (#12461) 
* enable ee build on pr/master

* step1: of including group sync

* disable commit pinning for now

* fixes broken build

* enable team to ldap group sync

* avoid returning error for missing external handler

* services: allow routes to be added before http server start

* services: allows services to add their own migrations

* moves db migrations to ee code base

* build using master branch in ee

* disable enterprise build in .bra.toml

[skip ci]

* removes team sync extensions

* removes commented line
 2018-07-01 07:01:43 -07:00
Carl Bergquist 88783d6e0a avoid calling os.Exit outside main.go (#12459) 
I don't think we should call os.Exit outside main.go. Calling
os.Exit breaks the application control flow.
 2018-06-29 22:48:26 -07:00
Carl Bergquist 1165d098b0 Merge pull request #12407 from pengwk/patch-1 
Fix typo
 2018-06-26 08:30:05 +02:00
Carl Bergquist 175e95abb0 Merge pull request #12396 from bergquist/routing 
routing: allows routes to be added to existing groups
 2018-06-25 17:17:14 +02:00
Carl Bergquist 15bbe81fed Merge pull request #12387 from AustinWinstanley/master 
Return a 404 when deleting a datasource through the API if it doesn't…
 2018-06-25 07:49:18 +02:00
Carl Bergquist 828fb39ee2 Merge pull request #11643 from mrsiano/generic_oauth 
Pass configured/auth headers to a Datasource.
 2018-06-21 14:21:59 +02:00
Carl Bergquist e17944db15 Merge pull request #12325 from albundy83/patch-1 
Fix error in InfluxDB query
 2018-06-21 10:57:26 +02:00
Carl Bergquist 578a8e8f55 Merge pull request #12322 from bergquist/sqlstore_refactoring 
expose session and transaction helpers to other services
 2018-06-20 10:22:06 +02:00
Carl Bergquist 764a4247f5 Merge pull request #12274 from xapon/11607-cleanup 
#11607 Cleanup time of temporary files is now configurable
 2018-06-18 13:50:05 +02:00
Carl Bergquist d6f4313c2f Merge pull request #12203 from bergquist/bus_multi_dispatch 
bus: support multiple dispatch in one transaction
 2018-06-18 10:54:05 +02:00
Carl Bergquist e2adb4ced5 Merge pull request #12302 from grafana/12199_cloudwatch_panic 
cloudwatch: handle invalid time range
 2018-06-16 16:57:23 +02:00
Carl Bergquist e33d18701d Merge pull request #12287 from bergquist/fix_12286 
Influxdb: add mode functions
 2018-06-15 12:43:47 +02:00
Carl Bergquist d3a3e7cfd1 Merge pull request #12222 from PrincipalsOffice/remove-QueryOptionsCtrl-references 
removed QueryOptionsCtrl references
 2018-06-13 09:34:02 +02:00
Carl Bergquist 5ed2880a8b Merge pull request #12202 from grafana/11486_sqlite 
Upgrade mattn/go-sqlite3 to v1.7.0
 2018-06-08 13:11:46 +02:00
Carl Bergquist 38864d74bd Merge pull request #12180 from grafana/deploy 
Propagate specific git-sha into tarball and docker builds
 2018-06-08 13:02:07 +02:00
Carl Bergquist 6d27c3d0c5 Merge pull request #12154 from grafana/11657_server_admin 
Always show server admin link in sidenav if grafana admin
 2018-06-05 08:02:05 +02:00
Carl Bergquist 7214ee9024 Merge pull request #12007 from bergquist/provisioning_symlinked_folders 
Add support for symlinked folders in dashboard provisioning
 2018-06-04 16:00:32 +02:00
Carl Bergquist 49d9235433 Merge pull request #12122 from grafana/provisioning_ha 
Support provisioning in HA setup where modtime differs
 2018-06-04 15:12:46 +02:00
Carl Bergquist 5c30643f6e Merge pull request #12101 from bergquist/devenv 
devenv: initial scripts for setting up devenv
 2018-05-30 21:49:17 +02:00
Carl Bergquist 813a9a975f Merge pull request #12090 from grafana/11858_create_dashboard_link 
Show create dashboard link if at least editor in one folder
 2018-05-29 17:18:41 +02:00
Carl Bergquist 519e58a267 Merge pull request #12071 from grafana/12056_usage_stats 
Additional anonymous usage stats
 2018-05-28 11:23:16 +02:00
Carl Bergquist 6c259eb04d Merge pull request #12077 from roidelapluie/logout 
Fix #9847 Add a generic signout_redirect_url to enable oauth logout
 2018-05-28 08:06:00 +02:00
Carl Bergquist ca7bbc44c0 Merge pull request #12050 from aarongarciah/patch-1 
Fix typo in README.md
 2018-05-24 15:18:56 +02:00
Carl Bergquist 64053e1954 Merge pull request #11788 from mtanda/prom_query_timeout 
add query timeout option for Prometheus
 2018-05-22 09:40:29 +02:00
Carl Bergquist a376de56f2 Merge pull request #11934 from liquidm/improve_alert_docs 
Improve alert docs
 2018-05-21 14:34:58 +02:00
Carl Bergquist dd8c50e140 Merge pull request #11988 from bergquist/tag_release_script 
build: script for tagging and pushing a release
 2018-05-18 16:37:11 +02:00
Carl Bergquist 0841e67da8 Merge pull request #11940 from alexanderzobnin/plugin-meta-field 
backend plugins: expose meta field
 2018-05-15 20:20:28 +02:00
Carl Bergquist fa9a95f645 Merge pull request #11887 from simPod/patch-1 
Update dashboard.md
 2018-05-08 21:27:32 +02:00
Carl Bergquist 8d13276844 Merge pull request #11852 from grafana/davkal/super-simple-docker 
Support for local Docker builds
 2018-05-08 09:17:01 +02:00
Carl Bergquist 23738ad4ac Merge pull request #11801 from grafana/provision-service-refactor 
Server shutdown flow rewrite & provision service refactor
 2018-05-07 16:32:26 +02:00
Carl Bergquist 06623506d3 Merge pull request #11805 from simPod/missing-lock 
Add missing items to Gopkg.lock
 2018-05-07 10:08:05 +02:00
Carl Bergquist 6ed69e3d93 Merge pull request #11775 from knweiss/unindent 
Opportunities to unindent code (unindent)
 2018-05-01 16:03:06 +02:00
Carl Bergquist c5419ba885 Merge pull request #11774 from knweiss/golint 
Fix golint warnings
 2018-04-28 09:40:56 +02:00
Carl Bergquist 2cc855a131 Merge branch 'master' into notification-service-refactor2 2018-04-27 16:59:14 +02:00
Carl Bergquist 28f7b6dad1 Enable Grafana extensions at build time. (#11752) 
* extensions: import and build

* bus: use predefined error

* enterprise: build script for enterprise packages

* poc: auto registering services and dependency injection

(cherry picked from commit b5b1ef875f905473af41e49f8071cb9028edc845)

* poc: backend services registry progress

(cherry picked from commit 97be69725881241bfbf1e7adf0e66801d6b0af3d)

* poc: minor update

(cherry picked from commit 03d7a6888b81403f458b94305792e075568f0794)

* ioc: introduce manuel ioc

* enterprise: adds setting for enterprise

* build: test and build specific ee commit

* cleanup: test testing code

* removes example hello service
 2018-04-27 13:41:58 +02:00
Carl Bergquist f2b5b6f299 Merge pull request #11694 from flopp999/patch-5 
Added requests/sec(throughput)
 2018-04-24 21:30:34 +02:00
Carl Bergquist 005556632f Merge pull request #11705 from mjtrangoni/fix-ineffassign-issues 
Fix ineffassign issues
 2018-04-24 12:56:16 +02:00
Carl Bergquist 6315142d00 Merge pull request #11689 from mjtrangoni/fix-ineffassign-issues 
pkg/tsdb: fix ineffassign isues
 2018-04-23 07:57:55 +02:00
Carl Bergquist 7e089314f7 Merge pull request #11688 from mjtrangoni/fix-gometalinter-circleci 
fix CircleCI gometalinter test
 2018-04-23 07:54:21 +02:00
Carl Bergquist 2dfa576c76 Merge pull request #11504 from hahnjo/11476-influxdb-show-cardinality 
influxdb: Check before assuming first column to be 'time'
 2018-04-19 11:18:01 +02:00
Carl Bergquist 4f0d7586ae Merge pull request #11648 from mjtrangoni/add-gometalinter-circleci 
Add gometalinter to CircleCI
 2018-04-19 09:35:21 +02:00
Carl Bergquist 89acafd567 Merge pull request #11646 from mjtrangoni/fix-varcheck-issues 
remove unused variables detected by varcheck
 2018-04-18 21:45:11 +02:00
Carl Bergquist 0ad6336634 Merge pull request #11354 from grafana/external-auth 
External auth refactor
 2018-04-18 14:03:50 +02:00
Carl Bergquist 54b7846eb6 Merge pull request #11635 from ohadbenita/patch-1 
Specify expected encoding for access/secret key
 2018-04-18 10:06:12 +02:00
Carl Bergquist 8367199a2d Merge pull request #11613 from knweiss/gosimple 
Code simplification (gosimple)
 2018-04-17 22:40:40 +02:00
Carl Bergquist 6ba830c73b Merge pull request #11632 from mjtrangoni/fix-codespell-circleci 
codespell: exclude by words instead of files
 2018-04-17 21:10:46 +02:00
Carl Bergquist 3801df5da8 Merge pull request #11602 from mjtrangoni/add-codespell-to-circle 
add codespell to CircleCI
 2018-04-17 19:02:32 +02:00
Carl Bergquist ac5836f895 Merge pull request #11623 from grafana/revert-11571-remove-codecov 
Revert "build: remove code cov"
 2018-04-17 09:13:31 +02:00
Carl Bergquist ca6dd9f53f Merge pull request #11622 from grafana/revert-11599-rm_codecov 
Revert "removes codecov from frontend tests"
 2018-04-17 09:13:06 +02:00
Carl Bergquist ea56288f4a Merge pull request #11611 from mjtrangoni/fix-unconvert-issues 
fix unconvert issues
 2018-04-17 09:06:39 +02:00
Carl Bergquist 450a3b4a00 Revert "build: remove code cov" 2018-04-17 09:00:55 +02:00
Carl Bergquist b6b152d9ea Revert "removes codecov from frontend tests" 2018-04-17 09:00:39 +02:00
Carl Bergquist 0976a46cb3 Merge pull request #11610 from grafana/davkal/bra-use-build-script 
bra should use the proper build script
 2018-04-17 08:51:01 +02:00
Carl Bergquist 2bfd6ab3e4 Merge pull request #11599 from bergquist/rm_codecov 
removes codecov from frontend tests
 2018-04-16 12:42:56 +02:00
Carl Bergquist 693ff1c000 Merge pull request #11579 from towolf/add-url-param-for-inactive-mode 
Add another URL param «inactive» which works like «kiosk» but with title
 2018-04-16 09:35:57 +02:00
Carl Bergquist a140296633 Merge pull request #11594 from xginn8/writable_plugins 
Grafana-CLI: mention the plugins directory is not writable on failure
 2018-04-16 09:27:19 +02:00
Carl Bergquist be2016f46e Merge pull request #11571 from bergquist/remove-codecov 
build: remove code cov
 2018-04-12 11:38:00 +02:00
Carl Bergquist dca73b9ab6 Merge pull request #11567 from 247Sports/docs/cloudwatch-backend-iam-policy 
Add minimal IAM policy example for CloudWatch data source
 2018-04-12 10:23:56 +02:00
Carl Bergquist b610f77bd6 Merge pull request #11541 from calebtote/patch-1 
Update annotations.md to contain correct annotations api path
 2018-04-10 09:07:11 +02:00
Carl Bergquist 880293eea1 Merge pull request #11445 from svenklemm/docs-dashboard 
docs: fix some typos in dashboard docs
 2018-03-30 20:41:31 +02:00
Carl Bergquist 375cc8de8f Merge pull request #11399 from roidelapluie/promba 
Fix #10555 #6888 Backslash in Prometheus variables
 2018-03-30 20:26:08 +02:00
Carl Bergquist 0a1bc53f3a Merge pull request #11406 from bergquist/gomail 
tech: migrates to none deprecated mail lib
 2018-03-28 14:19:39 +02:00
Carl Bergquist f009443a6f Merge pull request #11330 from digineo/auth-ipv6 
Support IPv6 in Auth proxy white list
 2018-03-28 14:17:43 +02:00
Carl Bergquist d37e8df991 Merge pull request #11412 from tettaji/variable-docs 
Clarified formatting multiple values doc
 2018-03-28 13:01:12 +02:00
Carl Bergquist 36adce17df Merge pull request #11411 from grafana/11247-save-alerts 
dashboard: allow alerts to be saved for new/provisioned dashboards
 2018-03-28 12:59:14 +02:00
Carl Bergquist cdf4664930 Merge pull request #11371 from towolf/add-duplicate-panel-hints 
Add hints for the 'pd' Duplicate Panel command from PR #11264
 2018-03-27 10:35:41 +02:00
Carl Bergquist 44eb33265c Merge pull request #11384 from Rohlik/patch-1 
Add new currency - Czech koruna
 2018-03-27 09:59:16 +02:00
Carl Bergquist a20f3d196c Merge pull request #11375 from svenklemm/graphite_docs 
doc: add missing word to graphite docs
 2018-03-25 21:20:41 +02:00
Carl Bergquist 980e078222 Merge pull request #11326 from bergquist/more_traces 
dataproxy: adds dashboardid and panelid as tags
 2018-03-23 17:13:15 +01:00
Carl Bergquist 8d7fa644de Merge pull request #11352 from digineo/golint 
Make golint happier
 2018-03-23 13:35:11 +01:00
Carl Bergquist 8db09d7556 Merge pull request #11290 from Thib17/retry 
Alerting: Add retry mechanism
 2018-03-23 13:17:24 +01:00
Carl Bergquist f0d77804da Merge pull request #11329 from alexanderzobnin/fix-11278 
fix dashboard version cleanup on large datasets
 2018-03-23 10:53:51 +01:00
Carl Bergquist d29116d8ff Merge pull request #11346 from infernix/fix-api-user-id 
Return actual user ID in UserProfileDTO
 2018-03-23 10:36:47 +01:00
Carl Bergquist 113888d6aa Merge pull request #11357 from tylerauerbeck/update_circleciv2 
Cleanup CircleCI V2 Conversion
 2018-03-23 10:29:37 +01:00
Carl Bergquist 22fffe0dda Merge pull request #11337 from digineo/golint 
Make golint happier
 2018-03-22 14:35:33 +01:00
Carl Bergquist 4bcc073813 Merge pull request #11322 from jordo1138/patch-1 
update email template default year and name
 2018-03-21 07:49:35 +01:00
Carl Bergquist 10a0460dc6 Merge pull request #11282 from alexanderzobnin/fix-11086 
Fix rendering link to panel in collapsed row
 2018-03-20 12:40:30 +01:00
Carl Bergquist f64c6e490a Merge pull request #11258 from mitjaziv/hide-credentials 
add regex search/replace of username/password in urls
 2018-03-20 09:37:09 +01:00
Carl Bergquist 930d00b513 Merge pull request #11284 from flopp999/patch-1 
Changed Swedish and Icelandic currency
 2018-03-19 08:15:34 +01:00
Carl Bergquist 1014f7c40a Merge pull request #11260 from iksaif/master 
alertmanager: handle resolved alerts, nodata, and execution errors + cleanups
 2018-03-16 09:11:59 +01:00
Carl Bergquist 18e498e0ff Update README.md 
Removes alpha 

closes https://github.com/grafana/grafana/issues/11251
 2018-03-14 21:07:55 +01:00
Carl Bergquist 105f6ff88c Merge pull request #11249 from bergquist/legacy_render_urls 
Avoid redirecting internal rendering requests
 2018-03-14 15:42:07 +01:00
Carl Bergquist 6d1e3613f7 Merge pull request #11246 from grafana/11227_import 
dashboard: fix import dashboard with alert rule(s)
 2018-03-14 14:38:29 +01:00
Carl Bergquist a8918047a2 Merge pull request #11238 from grafana/11155-mysql-issue 
middleware: recover and retry on session start
 2018-03-14 14:29:47 +01:00
Carl Bergquist 0ef94ea403 Merge pull request #11232 from grafana/11231_dash_url 
Should be possible to browse dashboard using only uid
 2018-03-14 14:18:58 +01:00
Carl Bergquist a0a57ac33a Merge pull request #11236 from grafana/alerting_collapsed_panels 
alerting: supports extracting alerts from collapsed panels
 2018-03-14 14:16:50 +01:00
Carl Bergquist 9cae6f05b4 Merge pull request #11225 from flopp999/patch-1 
Added icon for iOS web app
 2018-03-13 21:54:55 +01:00
Carl Bergquist 6df13252bf Merge pull request #11143 from ApsOps/colorize-singlestat-prefix-postfix 
Add color to prefix and postfix in singlestat panel
 2018-03-13 10:41:40 +01:00
Carl Bergquist bf6ff50d0b Merge pull request #11087 from alexanderzobnin/prometheus-heatmap 
Prometheus heatmap support
 2018-03-13 09:44:25 +01:00
Carl Bergquist ccd11ac928 Merge pull request #11212 from flopp999/patch-1 
Added concentration units and "Normal cubic metre"
 2018-03-13 08:23:04 +01:00
Carl Bergquist a9fd3e65ea Merge pull request #11214 from kkohtaka/patch-1 
docs: fix an outdated link to Prometheus's doc
 2018-03-13 08:00:26 +01:00
Carl Bergquist a9d485c1e8 Merge pull request #11205 from matrixik/patch-1 
Fix urls in plugin update_checker logs
 2018-03-12 20:40:24 +01:00
Carl Bergquist e94d23e5ff Merge pull request #10873 from willyhutw/cloudwatch_dimension_values_add_dimension_filter 
Cloudwatch dimension_values add dimension filter.
 2018-03-12 14:24:26 +01:00
Carl Bergquist 74602b1077 Merge pull request #11183 from jtyr/jtyr-timeticks 
Adding Timeticks unit
 2018-03-12 09:53:53 +01:00
Carl Bergquist 4edc49bfab Merge pull request #9859 from mtanda/prometheus_post 
(prometheus) support POST for query and query_range
 2018-03-12 09:21:45 +01:00
Carl Bergquist a589f701ad Merge pull request #10925 from mtanda/cw_high_resolution 
(cloudwatch) support high resolution query
 2018-03-08 18:06:08 +01:00
Carl Bergquist 5153d8e535 Merge pull request #11161 from DanCech/quota-refactor 
move quota to dedicated service
 2018-03-08 15:21:16 +01:00
Carl Bergquist 87db2d1183 Merge pull request #11130 from DanCech/context-refactor 
move Context and session out of middleware
 2018-03-08 10:21:34 +01:00
Carl Bergquist e3b86637f9 Merge pull request #11146 from grafana/go1.10 
Upgrade golang to 1.10
 2018-03-07 18:00:37 +01:00
Carl Bergquist 687179809e Merge pull request #11139 from jonyrock/patch-1 
Documentation fix: "~/go" to "$GOPATH"
 2018-03-07 17:51:21 +01:00