github.com/casbin/grafana commits | Ecosyste.ms: OpenCollective

Merge branch 'master' of github.com:grafana/grafana

dddd155afa10f191a5fae3014608b87d144518eb authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): added card layout selector and list view mode, #4364

c411714546a61e245d039fc09d0f86e2187df37d authored over 8 years ago by Torkel Ödegaard <[email protected]>

add graphite logo to datasource card

cba7c1726f1c4a7d073b0674b3a884327822f4d5 authored over 8 years ago by Trent White <[email protected]>

Slash escape regex

Slash symbol "/" wasn't escaped when we chose variable from template dropdown, so we couldn't ch...

be8ec241063e43a880abcd292e177aa00316ea25 authored over 8 years ago by simnv <[email protected]>

Merge pull request #4361 from bergquist/remove_staticRoot

plugin.json: remove staticRoot field

0b3ccaff27ac6b34b79d0cac7338c418b758b669 authored over 8 years ago by Carl Bergquist <[email protected]>

Merge branch 'master' into websocket

b273cd1339f924bcd17b925812e56d3a2dcd10d9 authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): initial pass at new card / list design, #4364

82eb32a71ecc1cc2f20d2cf039243f143a67805a authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(plugin.json): remove staticRoot field

e905c2c6b589dbbef9ee3e9a4ed67a8550ad9112 authored over 8 years ago by bergquist <[email protected]>

Merge pull request #4363 from cookiefission/fix/trim-edges-typo

Fix minor typo in tooltip

13376d89cc0a1cd09e5c46a75f98646b67677389 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(grafana_live): more work pushing data to websocket, #4355

2e1f26096f9e713326e5ea69e7376927a8d4a84c authored over 8 years ago by Torkel Ödegaard <[email protected]>

Fix minor typo in tooltip

8f97e8d5edb0fa02e9207800c70d5d166ecd134a authored over 8 years ago by Sean Kenny <[email protected]>

feat(websocket): reconnection and resubscription handling, #4355

92f20b9b7d374b9bd0dd3fc2a5aabace5ef4f40b authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(websocket): more work websocket ds, # 4355

3d5251d9a51c29846edbac8671d76434e9f66038 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(live): wip work

195be2742cc3288fd0101e88213be98eb71e1064 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(live): work on websocket data source, #3455

2adc4d12be3f87d27400291a972185cb05797f99 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' into websocket

8d7b7009c3ff32040fc7ac6b3c1032c2f057fd9c authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(datasource): filter out built in data sources from data source type dropdown

ca5a34ad1ee4a8004135c49e31e466aff91e9521 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(websockets): inital work on websockets, #4355

fbd94fc6ceed57f9f719e613314e217ec8c8e33b authored over 8 years ago by Torkel Ödegaard <[email protected]>

Revert "fix(datasource): fixes testdatasource bug"

This reverts commit f77bd59e1da4300c757284c293808ebb4b97c677.

953a07252afdfe6f7dbe2de7a69b1ac27ab78268 authored over 8 years ago by bergquist <[email protected]>

fix(datasource): fixes testdatasource bug

f77bd59e1da4300c757284c293808ebb4b97c677 authored over 8 years ago by bergquist <[email protected]>

Able to save preference version, created, updated fields

e371e03696acde9151f8594a740e9682e6fa90d5 authored over 8 years ago by utkarshcmu <[email protected]>

Merge branch 'master' into websocket

5b6754ce6cf0450032c475f6e24961f3ad8c49f0 authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(opentsdb): fixed templating issue for OpenTSDB, fixes #4312, fixes #4311

4aba3bc62bbfcc87419b4e31599b38bb235cbe26 authored over 8 years ago by Torkel Ödegaard <[email protected]>

docs(): updated doc version

fc6ad2059a68c302cc6046d89551841fa3b416a8 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(plugins): added filter (type) tabs po plugin list view

69c8bb1eb3be4f028b0d833145e6b44a3f6a624f authored over 8 years ago by Torkel Ödegaard <[email protected]>

Able to save home dashboard

0bf721a74ce3cf102142889976fe7f6ff9bc9bda authored over 8 years ago by utkarshcmu <[email protected]>

feat(plugins): added dashboards tab to plugin edit page, #4275

c504abb84d24e4b447cc68a600c60b3857ca540b authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' of github.com:grafana/grafana

2527289e3ecfcc08839dc00556b8d0ccf487e74d authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(plugins): polish to plugin page, better handling for reading readme file contents

581ffb862caea9828a9d9fb53634c6f6eb001d61 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(cli): improve error message for missing permission

8e70e9c1c3aa5097b8071c7826a9ed11e99f4669 authored over 8 years ago by bergquist <[email protected]>

plugins(): dashboards, changed wording installed to imported when showing imported version in dashboard list

4a3c19c666e7d627fdf8ab7359f9c4d7bca33953 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(plugins): added prometheus dashboard to prometheus data source, #4298

d575a5ce1230c3ed51cc148aa7e962a706219b6c authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'dashboard-install'

53dc145ce7d5472f9d527da62c8a53fd68b93e41 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(plugins): dashboard import for data sources is working! #4298

0398face05aac33ed42453570b919e9a125c32ce authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' of github.com:grafana/grafana

ef7d8ab90ba25febe6cf7e2617c988eb102ae98d authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(datasource edit): Editing datasources broken earlier today, fixes #4343

28f4f3a8c884217d950fd1a0282b70385f3218f8 authored over 8 years ago by Torkel Ödegaard <[email protected]>

refactor(): refactoring json usage

3fb0b71822bf7f7a1943acd88efe9fd965561dcc authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(): fixed from db -> json

40b2f00dc5b1dfee5800b292c3bd894747e365c4 authored over 8 years ago by Torkel Ödegaard <[email protected]>

updated lib

749da42ffcb740d27d8d465ef3bdd84c35e06fd8 authored over 8 years ago by Torkel Ödegaard <[email protected]>

lib(): added simplejson lib

1f9f439acb1015307fe53e52202864d9b6c69e8d authored over 8 years ago by Torkel Ödegaard <[email protected]>

more work on dashboard importing and templating

c5a817194a0a669434516e7c942b55721dc1c368 authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(plugins): fixes broken plugin link

c1e4d0590c40206c28a72fe52b647d5f02a2f1e3 authored over 8 years ago by bergquist <[email protected]>

fix(plugins): fixes broken link

85466c7ee1ce5299ed67943a42ee7c8f10fef3ae authored over 8 years ago by bergquist <[email protected]>

Preferences model updated

43b474143cf1c55264ef033299aa253a7c98e618 authored over 8 years ago by utkarshcmu <[email protected]>

Merge branch 'master' into cli_colors

740478344ba7d8dfccb456ec041a799083d26d15 authored over 8 years ago by bergquist <[email protected]>

feat(cli): improves error message for 401 requests

5094c1db2a970293fc788257caa7c0e8ea203a82 authored over 8 years ago by bergquist <[email protected]>

feat(cli): improve error handling for missing plugin dir

f5bb2b11e5d8afe3d06bd542bde1496bc70f892f authored over 8 years ago by bergquist <[email protected]>

feat(cli): add grafana net url

8da702c2e7977fdf6d8bf357adf657afd1879762 authored over 8 years ago by bergquist <[email protected]>

fix(): fixed changed partials paths

d2b0bad1cffa0df4a2ea59c4064c2f57a8e8e542 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' of github.com:grafana/grafana

Conflicts:
examples/nginx-app/package.json
examples/nginx-app/plugin.json

ece8a925a6df8b6d57cdeba579dba6313d83d4a0 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(plugins): more work on plugin dashboard install, #4298

fc54c01f01dc9e5136b65d8e477cfa2458d24043 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge pull request #4335 from mtanda/cloudwatch_tag_query

(cloudwatch) support tag query

3fd420c90185e273554ac25d439ca0b738168556 authored over 8 years ago by Torkel Ödegaard <[email protected]>

(cloudwatch) add document for new query

01788e86e5b63e0508924e788ea1ef9866b790db authored over 8 years ago by Mitsuhiro Tanda <[email protected]>

docs(examples): move app example into new repo

4f52bc138fed3f2b378cb98452b389040c4a5e2e authored over 8 years ago by bergquist <[email protected]>

feat(plugins): progress on dashboard installs , #4298

2de439bd1ebf6adbfcd4c962fe57ee6c16bf8c81 authored over 8 years ago by Torkel Ödegaard <[email protected]>

minor fix

b989e2ce37fdaa9b14f142e6c61b309123f6aa0a authored over 8 years ago by Mitsuhiro Tanda <[email protected]>

(cloudwatch) change parameter form of ec2_instance_attribute()

25f08ddd39661b571d767a8ecae07f13cd6eca1d authored over 8 years ago by Mitsuhiro Tanda <[email protected]>

fix(examples): update link in readme

a16c799da931319f24178ed06f9932b999575544 authored over 8 years ago by bergquist <[email protected]>

(cloudwatch) add ec2_instance_attribute() query

0052e9d13623961b4abe3a7c18fa88030b9427d8 authored over 8 years ago by Mitsuhiro Tanda <[email protected]>

example(panel): rename to match new convetion

b72cf90ed43b29f36f79a38fd5be5bc7da6fc32f authored over 8 years ago by bergquist <[email protected]>

Merge branch 'master' of github.com:grafana/grafana

69013ef8ad989ac5f445e948676ff87c84b72d4f authored over 8 years ago by bergquist <[email protected]>

Merge pull request #4331 from mtanda/cloudwatch_add_metrics_dimensions

(cloudwatch) add metrics/dimensions of AWS/Events and AWS/Logs

16132e86a3e71d219b1eb1947d3d11f4a2fa4b00 authored over 8 years ago by Carl Bergquist <[email protected]>

Merge pull request #4330 from tdyas/fix_nginx_app_example

remove extra comma in nginx-app's package.json

047191abf01722cba7095183c4aeab0c69efad05 authored over 8 years ago by Carl Bergquist <[email protected]>

Merge pull request #4332 from simnv/influxdb-tags-multiple

InfluxDB: Fix groupby selection

11372ac9ff37719189436ae783116b5258852c2c authored over 8 years ago by Torkel Ödegaard <[email protected]>

Fix groupby selection

Default groupby selection for influxdb is escaped not like a regex, but as a glob. It works fine...

336c1b7b6e17292d033181cfa0d51e633ed705b1 authored over 8 years ago by simnv <[email protected]>

(cloudwatch) add metrics/dimensions of AWS/Events and AWS/Logs

2c5abed2f1bc3a9a2c9c81c58fe9c4ed3a810eff authored over 8 years ago by Mitsuhiro Tanda <[email protected]>

remove extra comma in nginx-app's package.json

otherwise grunt fails due to a syntax error in package.json

8c6890c95fa4a824d5ace0cddc7783b8b2a4f688 authored over 8 years ago by Tom Dyas <[email protected]>

feat(plugins): worked on plugin dashboard import handling

60adcedebe6c9a48535bac83f767179f420dc1ef authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(cli): adds some amazing colors

95de5f6fe1a0e63c61adc96c6beaf93046fdd356 authored over 8 years ago by bergquist <[email protected]>

feat(cli): disable dependecy downloads until needed

788aafff3cbbf635227cb1326c7c034c48ac5842 authored over 8 years ago by bergquist <[email protected]>

feat(navigation): hide new and import for viewers

closes #4326

c09d506245f0d2a6572289b61280ea0c4d959075 authored over 8 years ago by bergquist <[email protected]>

Merge branch 'cli_compose_download_url'

18c5e90076320e0ccff8ab3cdba00c64accce52a authored over 8 years ago by bergquist <[email protected]>

feat(cli): support for asking grafana net about plugins

fee0745e983a25140b127b6ca32c45fdf88bdda2 authored over 8 years ago by bergquist <[email protected]>

feat(renderer): add timeout for the renderer api

closes #4325

43073da7eb11444ae751ce34528117db4ccbc916 authored over 8 years ago by bergquist <[email protected]>

docs(configuration): add redis as session storage

0b6fee138a292ee25db6dea7371529ce2019e2db authored over 8 years ago by bergquist <[email protected]>

feat(plugins): minor progress on dashboard imports

78b9c3004a713681b61837b0d2b1c819e0e75e3d authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge pull request #4322 from utkarshcmu/add-api

#4258 Implemented GetDataSourceIdByName API

c99aa7414099dcca9251fa91a9cd74663d15cb68 authored over 8 years ago by Carl Bergquist <[email protected]>

Implemented GetDataSourceIdByName API

4fbff991860ce0c7412091f5638ad986cdadf2d5 authored over 8 years ago by utkarshcmu <[email protected]>

Moved api in correct group

8afd56575c0c69d9294fc1d25ae05ca1ca8b496f authored over 8 years ago by utkarshcmu <[email protected]>

feat(plugins): refactored datasourceEditCtrl to typescript, #4298

1951f3856f2427b4d3462d35881b80f943c5f6f0 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge pull request #4313 from PaulMest/patch-1

Update ldap.md

8357cdf59174386788c39898289c349973c89ac8 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge pull request #4320 from mtanda/templating_fix_on_time_range_change

fix to use variable.refresh flag

499bad5f532a9624f89f33ab2895583fc754a3a5 authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix to use variable.refresh flag

df2a23d1a7063d7739b949a99001b442604ffc39 authored over 8 years ago by Mitsuhiro Tanda <[email protected]>

Update ldap.md

Added clearer language on which versions offer LDAP support.

d6ecf74db497787ea6b946e5ef89d408c5e6a19a authored over 8 years ago by Paul Mestemaker <[email protected]>

feat(cli): allow redirect for plugin-repo.json

6670e6cd29c0051e00aed24009eb38d38780150d authored over 8 years ago by bergquist <[email protected]>

Merge branch 'master' into dashboard-thing

d8b11adfd52417285a4ea61afe34024bcf5fdce1 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(templating): refactoring of the refresh values of #4281

4a5b753fd8d4b9e4f67f6ef0c10ad287fafd5248 authored over 8 years ago by Torkel Ödegaard <[email protected]>

github(pr_template): minor guide for PRs

d9231eb805473a3b32e9575c5e25af27f83b9b82 authored over 8 years ago by bergquist <[email protected]>

fix(build): updated moment.js to fix systemjs build issue, fixes #4306

bb1e7f62a0f127b21c744bc9970d343b202dc8ff authored over 8 years ago by Torkel Ödegaard <[email protected]>

github(issue_template): minor improvement

e5ffb2bfd2013c9efaa387d03a2e76289c455c7e authored over 8 years ago by bergquist <[email protected]>

Merge branch 'mtanda-refresh_temp_value_by_time_range_changes'

6fff0b3e2a90621c72d26c00489f614b52c16c81 authored over 8 years ago by bergquist <[email protected]>

style(templating): tigth-form -> gf-form

f0d1853a668c8d0db38f865b0fcf215eaa1ab053 authored over 8 years ago by bergquist <[email protected]>

Merge branch 'refresh_temp_value_by_time_range_changes' of https://github.com/mtanda/grafana into mtanda-refresh_temp_value_by_time_range_changes

7224728ab84666b0d8e7251e11fdf3645d73d946 authored over 8 years ago by bergquist <[email protected]>

docs(changelog): add opentsdb annotations to changelog

ca7c3cc27d86b5085f983c83db5ade61082e75c7 authored over 8 years ago by bergquist <[email protected]>

Merge pull request #4296 from knowroozi/opentsdb_annotations

add annotations for opentsdb

ac439d83fe86a012b82d9f4aa075cf483ab177d5 authored over 8 years ago by Carl Bergquist <[email protected]>

fix(jshint): fixed jshint warning

c0b92eb5d056847b6488c998d85403fd7faaf710 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' of github.com:grafana/grafana

5599bdf1bc1ddd7bc60401f8aab7e656ca9d8f64 authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(share): fixed checkboxes in share modal, fixes #4301

de41536046cf0fe4f86dec461afef9db4e0418a7 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge pull request #4295 from utkarshcmu/nav-fix

Minor nav fix

30d321998c5bfdc8105be9a939a27fd792ffa184 authored over 8 years ago by Torkel Ödegaard <[email protected]>

example(plugin.json): add example dashboard file

59a02ce76a98adc2ddef573dc6dc9442f7081ec1 authored over 8 years ago by bergquist <[email protected]>