Ed Dawley
4da56b65ab
Fixes #2818 . Adds support for mysql backends via unix sockets
2015-12-23 15:06:28 -06:00
Ed Dawley
cd23ab9955
Issue 3461: Session table is now created automatically
2015-12-23 01:33:46 -06:00
Torkel Ödegaard
41a0995db7
feat(apps): minor progress on app meta data
2015-12-22 16:32:17 +01:00
Daniel Low
3f9f0679ec
gofmt
2015-12-22 13:10:34 +00:00
Daniel Low
ea566fff24
Add TLS for mysql
...
Use ssl_mode for mysql and add docs
add docs for the new parameters in config
Tolerate ssl_mode without client authentication
Client cert is not necessary for a SSL connection. So we tolerate
failure if client cert is not provided.
Improve error message if missing server_cert_name and mode is not
skip-verify.
2015-12-22 12:42:52 +00:00
Torkel Ödegaard
ad94f99d57
refactor(apps): more WIP work on apps
2015-12-22 11:37:44 +01:00
utkarshcmu
bcaaedf2ff
Resurrected nikita-graf's work and added playlistType for future use
2015-12-22 02:07:15 -08:00
Torkel Ödegaard
eacc46da6d
feat(plugins): WIP on new apps concept
2015-12-21 23:09:27 +01:00
woodsaj
0903d5541b
Merge branch 'master' of github.com:grafana/grafana into externalPlugin
...
Conflicts:
pkg/api/api.go
pkg/api/api_plugin.go
pkg/api/datasources.go
pkg/api/frontendsettings.go
pkg/api/index.go
pkg/plugins/models.go
pkg/plugins/plugins.go
2015-12-22 00:23:24 +08:00
Carl Bergquist
fabaf5cc04
Merge pull request #3575 from piotr1212/no_username_in_render_logging
...
Fix empty username in http log for /render calls
2015-12-21 13:31:10 +01:00
Carl Bergquist
af9b864b83
Merge pull request #3446 from utkarshcmu/new-columns
...
Displaying Last UpdatedBy as Metadata
2015-12-20 15:11:20 -05:00
utkarshcmu
d8b90721b3
Able to display login Id of the user in Last Updated By
2015-12-18 03:38:49 -08:00
utkarshcmu
cb5c1bd24d
Removed created_by and fixed gofmt
2015-12-18 02:30:20 -08:00
utkarshcmu
af371249f9
Successfully displayed userdId in UI
2015-12-18 01:52:05 -08:00
utkarshcmu
22fd2aed02
Removed columns from snapshot table
2015-12-18 00:30:44 -08:00
utkarshcmu
c433167950
Merged with master, resolved conflicts
2015-12-18 00:23:08 -08:00
utkarshcmu
e0ffcda32e
Added UI , DB settings
2015-12-18 00:20:23 -08:00
woodsaj
3d15ee6d74
allow app menu items to be selectivly pinned to the left nav menu
2015-12-18 15:10:52 +08:00
woodsaj
48cf56b69a
more renaming. also moved apps and datasource menus
2015-12-18 13:46:40 +08:00
woodsaj
c35b51a268
refactor.
...
Rename externalPlugin to apiPlugin
Rename bundle to app
Move js, css, menuItem and staticRoot to be properties os App
Add "app" field to panel, datasource and api plugin models. If populated
then the plugin is only enabled if the specific app is enabled for the Org.
If app is "", then the plugin is enabled for all orgs and can't be disabled.
2015-12-17 23:53:58 +08:00
Carl Bergquist
333f9101a0
Merge pull request #3458 from improbable-io/use-memcache-for-session
...
Add memcache as session provider
2015-12-17 15:56:15 +01:00
Piotr Popieluch
e29e3416db
router logger did not show username in /render calls because cookies are
...
cleared in these call. Not just get username before the call is
executed. see #3405 for more info.
2015-12-17 14:28:11 +01:00
utkarshcmu
78fe588330
Removed NewAddColumnMigration via 3473
2015-12-16 02:46:20 -08:00
carl bergquist
d4e98cd9bc
Merge branch 'feature/symlinks' of https://github.com/jmaitrehenry/grafana into jmaitrehenry-feature/symlinks
...
Conflicts:
pkg/plugins/plugins.go
closes #2899
closes #2834
2015-12-16 09:21:52 +01:00
Carl Bergquist
25d93d1041
Merge pull request #3066 from mtanda/cloudwatch_annotation
...
(cloudwatch) annotation support
2015-12-15 13:43:02 +01:00
Torkel Ödegaard
f83d5f4280
cleanup(influxdb_08): removed influxdb 0.8 data source as an built in official data source, moved it to an external plugin repo, https://github.com/grafana/datasource-plugin-influxdb-08 , closes #3523
2015-12-15 11:21:00 +01:00
Torkel Ödegaard
5eab5dc47b
feat(plugins): removed external plugins and bundle code, not ready for master yet, will revert this commit in seperate branch
2015-12-15 10:28:52 +01:00
Torkel Ödegaard
2ec5bc77d7
Merge branch 'external-plugins'
2015-12-15 10:10:48 +01:00
Mitsuhiro Tanda
6fa5e681aa
fix EC2RoleProvider parameter
2015-12-15 11:25:20 +09:00
Mitsuhiro Tanda
e631940d9e
pkg/api/cloudwatch: fix api client construction against aws-sdk-go v0.10.2
2015-12-15 11:25:19 +09:00
Mitsuhiro Tanda
6beb9be42c
add CloudWatch Alarm API support
2015-12-15 11:25:15 +09:00
Carl Bergquist
280f9befae
Merge pull request #2949 from shoonoise/master
...
Add option to hide raintank share button
Fixes #2727
2015-12-14 17:29:09 +01:00
Torkel Ödegaard
201f50b121
Merge branch 'master' into external-plugins
...
Conflicts:
pkg/api/login.go
public/app/core/routes/all.js
public/app/core/table_model.ts
public/app/panels/table/table_model.ts
public/app/plugins/panels/table/editor.ts
public/app/plugins/panels/table/table_model.ts
2015-12-14 17:28:57 +01:00
Carl Bergquist
548ee47aa7
Merge pull request #3122 from shoonoise/hide_signout
...
Disable sign out button in case of auth proxy enabled
2015-12-14 17:18:04 +01:00
Torkel Ödegaard
b63471ebe9
fix(windows): exclude syslog feature from windows builds
2015-12-14 16:16:36 +01:00
Torkel Ödegaard
c7e3ed096f
fix(postgres): fixes db migration issue with_credentials column for postgres, fixes #3505
2015-12-14 10:19:53 +01:00
Carl Bergquist
4ee9e48e7c
Merge pull request #3405 from piotr1212/master
...
Add more info in route logging
2015-12-11 16:23:59 +01:00
carl bergquist
fab1062c0b
Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints
...
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
closes #2571
closes #2494
2015-12-11 15:16:57 +01:00
Carl Bergquist
225e7a6a32
Merge pull request #3161 from mischief/syslog
...
syslog support closes #3160
2015-12-11 14:03:21 +01:00
Mitsuhiro Tanda
c8e894e8f8
sort metrics and dimensions
2015-12-11 17:56:35 +09:00
Mitsuhiro Tanda
d9844350fe
update supported metrics and dimensions
2015-12-11 17:42:40 +09:00
Mitsuhiro Tanda
2d9d11a89c
reorder supported metrics and dimensions
2015-12-11 17:19:56 +09:00
Mitsuhiro Tanda
6edd6c8f03
add with_credentials to datasource model
2015-12-09 14:44:28 +09:00
Daniel Low
d7f3869959
gofmt
2015-12-08 14:59:54 +00:00
Daniel Low
ed16914715
Add memcache as session provider
2015-12-08 13:35:09 +00:00
utkarshcmu
79d0f47ee7
Added columns in dashboard_snapshot
2015-12-07 04:24:29 -08:00
utkarshcmu
42d1205260
Fixed gofmt checks
2015-12-06 23:59:58 -08:00
utkarshcmu
3d90340446
Added new columns to dashboard table
2015-12-06 23:51:43 -08:00
Mitsuhiro Tanda
d1ccf83236
(cloudwatch) use paging
2015-12-06 21:35:20 +09:00
woodsaj
0697274695
I add plugin dependency check.
...
This check ensures that all of the plugins required by a bundle
are loaded.
2015-12-05 01:20:42 +08:00
woodsaj
3c13901695
add ui elements for plugins.
...
This includes support for cusom plugin config directives.
2015-12-04 19:21:33 +08:00
Torkel Ödegaard
67dc761344
fix(security): do not print ENV config values when they are passwords, fixes #3337
2015-12-04 10:38:27 +01:00
woodsaj
c4a0fe0234
add pluginBundle backend api methods and SQL storage
2015-12-03 23:43:55 +08:00
Piotr Popieluch
207c1a20ee
router logger, log username taken from cookie
2015-12-03 11:05:50 +01:00
Piotr Popieluch
579bc1c2c8
Add more info in route logging
...
- Add remote address
- Add method
- Add protocol
- Add response size
- Use consistent unit for response time (us)
2015-12-03 09:28:42 +01:00
woodsaj
bd4cb549d6
add pluginBundle support
...
A plugnBundle is meta plugin that has a set of dependent plugins
to enable. This commit includes a plugin.json for a default
"core" bundle that enables all of the shipped panels and datasources.
2015-12-03 15:52:37 +08:00
woodsaj
fd392a2422
Merge remote-tracking branch 'upstream/external-plugins' into externalPlugin
...
Conflicts:
public/views/index.html
2015-12-03 12:47:58 +08:00
woodsaj
13864853a8
support separate css files for light/dark themes.
2015-12-03 12:29:57 +08:00
Torkel Ödegaard
aa766e3e18
Merge branch 'external-plugins' of github.com:grafana/grafana into external-plugins
2015-12-02 18:31:05 +01:00
Torkel Ödegaard
ee0e4d2b69
Merge branch 'master' into external-plugins
...
Conflicts:
public/app/plugins/panels/table/editor.ts
public/views/index.html
2015-12-02 18:30:48 +01:00
woodsaj
79d29db18b
really fix unit tests.
2015-11-27 17:17:27 +08:00
woodsaj
4f6a52503d
fix plugin unit test
2015-11-27 17:04:43 +08:00
woodsaj
1b5c40dd1f
add role access limitions for menu items.
...
This allows external-plugin menu items to conditionally
be added to the UI depending on the logged in users
current role.
2015-11-27 16:27:14 +08:00
woodsaj
700b77c450
implement role access checks on external-plugin routes.
2015-11-27 16:26:30 +08:00
woodsaj
8449017592
Add plugin type field to externalPlugin model
2015-11-27 15:21:57 +08:00
shoonoise
5cf3425b93
Disable sign out button in case of auth proxy enabled
2015-11-26 17:56:45 +03:00
Mitsuhiro Tanda
2aabb387b1
fix EC2RoleProvider parameter
2015-11-26 16:01:33 +09:00
Mitsuhiro Tanda
f972863f49
add credential setting to handleDescribeInstances
2015-11-26 13:21:38 +09:00
utkarshcmu
5559ad1238
Return correct updated+created timestamps to frontend
2015-11-21 05:03:00 -08:00
Torkel Ödegaard
29f6283eab
Merge branch 'master' into external-plugins
2015-11-21 13:48:31 +01:00
Torkel Ödegaard
4a69de1f30
feat(plugins): made panels work as plugins
2015-11-21 13:46:43 +01:00
utkarshcmu
1b7f4f31ca
Tired of gofmt
2015-11-20 04:52:50 -08:00
utkarshcmu
ca01604b43
Added statements in constructor
2015-11-20 04:37:24 -08:00
utkarshcmu
93f9a0c39c
Fixed created & updated columns in dashboard table
2015-11-20 03:10:24 -08:00
Torkel Ödegaard
df0bc7bbc4
feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185
2015-11-20 09:43:10 +01:00
Torkel Ödegaard
69daede583
feat(external plugins): worked on supporting external plugins better
2015-11-19 18:44:07 +01:00
Torkel Ödegaard
65a7fa320a
feat(plugins): made plugins that live outside public work
2015-11-19 16:50:17 +01:00
Torkel Ödegaard
f6772bb896
feat(plugins): began work on supporting having plugins outside grafana, for example in grafana data dir, next step is to be able to easily specify what plugins you waant to install
2015-11-19 12:55:13 +01:00
Torkel Ödegaard
b21fa2daa0
Merge branch 'externalPlugin' of https://github.com/raintank/grafana into external-plugins
2015-11-19 11:05:27 +01:00
Torkel Ödegaard
7db38c80fc
Merge branch 'aws-sdk-go' of https://github.com/mischief/grafana into mischief-aws-sdk-go
2015-11-18 17:16:42 +01:00
Torkel Ödegaard
f0087c93b8
fix(admin settings view): always censor provider_config for system info view, fixes #3268
2015-11-18 15:55:45 +01:00
Torkel Ödegaard
79313aa268
Merge pull request #3253 from mtanda/cloudwatch_ecs
...
(cloudwatch) support ECS suggestion
2015-11-17 14:00:31 +01:00
utkarshcmu
f5db9950f8
fixed gofmt tests
2015-11-16 07:28:38 -08:00
utkarshcmu
9485e8cfee
/api/admin/users returns user ID
2015-11-16 06:55:02 -08:00
Mitsuhiro Tanda
22b139d9f8
(cloudwatch) support ECS suggestion
2015-11-16 23:21:43 +09:00
Torkel Ödegaard
32f9f8fcce
fix(http api): correct return status code for /api/datasources/:id so it eturns 404 when not found, fixes #3217
2015-11-13 09:43:25 +01:00
woodsaj
437b957be1
remove external_plugin from models package.
2015-11-11 17:45:38 +08:00
woodsaj
d503c5d83d
refer to plugins are ExternalPlugin instead of thirdParty
2015-11-11 14:30:07 +08:00
Mitsuhiro Tanda
02a37d670c
sort namespaces by alphabetical order
2015-11-11 14:23:43 +09:00
Mitsuhiro Tanda
a7deca1df5
sort regions by alphabetical order
2015-11-11 14:23:38 +09:00
Torkel Ödegaard
5d8a51c307
Merge pull request #3129 from utkarshcmu/validity
...
Default AWS Region selection from dropdown
2015-11-09 22:25:30 +01:00
utkarshcmu
6325635fce
Corrected the frontend filename
2015-11-09 12:31:35 -08:00
utkarshcmu
7612e47aee
Select AWS region from dropdown
2015-11-09 12:08:40 -08:00
Torkel Ödegaard
0a04b135ca
Merge pull request #3158 from dthapa/master
...
use [auth.github] -> api_url property; supports git enterprise
2015-11-09 10:12:57 +01:00
utkarshcmu
f55e24cd12
Added missing AWS Regions
2015-11-09 00:28:16 -08:00
Nick Owens
60e797ccc4
pkg/setting: integrate syslog logger settings
2015-11-07 18:35:57 -08:00
Nick Owens
0bff097afb
pkg/log: implement syslog logger
2015-11-07 18:34:55 -08:00
Nick Owens
b0cb6d6d4c
pkg/api/cloudwatch: fix api client construction against aws-sdk-go v0.10.2
2015-11-07 18:17:05 -08:00
Don Thapa
b345c7cf46
gofmt happiness
2015-11-07 11:32:06 -06:00
utkarshcmu
fe2d8f1ea0
Used dialect for postgres
2015-11-07 05:21:22 -08:00
Don
e16bbc660d
use [auth.github] -> api_url property; supports git enterprise
2015-11-07 00:06:15 -06:00
utkarshcmu
2676f24e0a
Fixed user deletion in Postgres SQL
2015-11-06 20:17:27 -08:00
shoonoise
b4a2b96e32
Add options to manage snapshot publishing
2015-10-29 16:40:03 +03:00
Torkel Ödegaard
5d64568f3e
refactoring: some minor refactoring and changes to AWS profile PR #3053
2015-10-29 11:44:34 +01:00
Jari Sukanen
23599814a3
cloudwatch: add support for defining AWS profile for CloudWatch datasource
...
Add support for defining AWS profile for CloudWatch datasource to support
pulling information from multiple different AWS accounts to single dashboard.
With this change, it is possible to define multiple AWS credentials in
~/.aws/credentials file and connect different data sources to different
AWS accounts.
2015-10-27 17:00:02 +02:00
Torkel Ödegaard
09b3433e32
change(dashboards): made home dashboard and json file dashboards editable unless otherwise specified in json file, closes #2567
2015-10-26 18:54:32 +01:00
Torkel Ödegaard
323e84375b
refactoring: minor refactoring and handling of known data source plugins
2015-10-26 16:37:45 +01:00
Torkel Ödegaard
da3d5375b8
feat(ldap): refactoring of PR #2928 updated docs
2015-10-26 16:21:03 +01:00
Torkel Ödegaard
38bd0d1aec
Merge branch 'ldap-improvements' of https://github.com/abligh/grafana into abligh-ldap-improvements
2015-10-26 15:56:21 +01:00
Torkel Ödegaard
da7ae2b0ab
fix(build/aws): updated aws dependency and fixed minor build issue, fixes #3026
2015-10-26 12:48:30 +01:00
Torkel Ödegaard
6fecb4bf3e
fix(http route): fixed dashboard-solo route to not return 404, fixes #2979
2015-10-20 10:02:56 -04:00
Anthony Woods
cf89b565a6
initial import of thirdParty route support
2015-10-15 04:14:09 +08:00
Alex Bligh
e8256f0ad7
Add support for POSIX LDAP schema
...
In the POSIX LDAP schema, there is no 'memberOf' attribute returned
in relation to which groups a person is a member of. Rather, it is
necessary to query the group objects which have the people as members.
This commit adds an additional filter, which if specified explicitly
searches for groups, rather than relying on the 'memberOf' attribute.
This enables Grafana to work with LDAP POSIX schema (e.g. OpenLDAP
etc.)
Signed-off-by: Alex Bligh <alex@alex.org.uk>
2015-10-13 19:51:59 +01:00
Alex Bligh
458e6da700
Allow user specified CA certs
...
Signed-off-by: Alex Bligh <alex@alex.org.uk>
2015-10-13 19:47:24 +01:00
Alex Bligh
a906fa178a
Support multiple space-separated LDAP hosts
...
Signed-off-by: Alex Bligh <alex@alex.org.uk>
2015-10-13 19:46:53 +01:00
Torkel Ödegaard
e873574e8c
fix(logging): fixed so that router_logging = true actually logs all http requests, fixes #2902
2015-10-10 17:55:15 -04:00
Torkel Ödegaard
c831369974
fix(influxdb): influxdb data source did not use right http abstraction for metric queries, fixes #2919
2015-10-10 11:46:00 -04:00
Torkel Ödegaard
9fc91b7aa1
fixed gofmt issue
2015-10-08 17:30:13 +02:00
Torkel Ödegaard
fe46410c31
Merge branch 'cloudwatch'
2015-10-08 13:09:27 +02:00
Julien Maitrehenry
4bb656b704
#2834 - follow symlink
2015-10-08 00:22:09 -04:00
Torkel Ödegaard
106fe4854f
Merge branch 'prometheus' of github.com:grafana/grafana
...
Conflicts:
pkg/models/datasource.go
public/app/plugins/datasource/prometheus/datasource.js
public/app/plugins/datasource/prometheus/partials/query.editor.html
public/app/plugins/datasource/prometheus/queryCtrl.js
2015-10-06 16:36:58 +02:00
Torkel Ödegaard
182e079d25
Merge branch 'master' into cloudwatch
2015-10-06 14:08:10 +02:00
Torkel Ödegaard
3d52095765
feat(cloudwatch): restored dimension keys lookup
2015-10-02 20:25:28 +02:00
Torkel Ödegaard
0912cec0e5
feat(cloudwatch): contining work on moving hard coded stuff to backend and cleaning up code, #684
2015-10-02 11:54:35 +02:00
Torkel Ödegaard
180ba33ac8
feat(cloudwatch): refactoring and cleanup of backend code, started moving hard coded stuff in the frontend to the backend, changed name of metricFind queries region() -> regions() , and namespace() -> namespaces() to be more consistent with the others, #684
2015-10-02 11:10:21 +02:00
Torkel Ödegaard
04f4454974
feat(cloudwatch): lots of code refactoring and cleanup, #684 , dimension values lookup works but seems to return all dimension values no matter what dimension key you select, removed strange formating of template dimension values query, should not return key value pair but only the dimension value
2015-10-02 09:04:46 +02:00
ctdk
d37e18fdcf
Add config option to strip (most) colors from console logs
2015-10-01 13:16:23 -07:00
Julius Volz
3cc69112c1
Fix "Link to Prometheus" button for proxied Prometheus sources.
2015-10-01 18:23:29 +02:00
Torkel Ödegaard
057b533a39
Merge branch 'master' into cloudwatch
2015-10-01 16:46:59 +02:00
Torkel Ödegaard
c816ed2527
feat(usage stats): added data source count stats
2015-09-29 13:47:56 +02:00
Mitsuhiro Tanda
9ae6ac25f5
refactor dataproxy_cloudwatch
2015-09-26 02:33:53 +09:00
Mitsuhiro Tanda
9600b1f103
add ebs_volume_ids() for templating
2015-09-26 02:33:51 +09:00
Torkel Ödegaard
7f1af24318
fix(ldap): fixed ldap org roles sync, did only add one new role per login, now all roles are added, fixes #2766
2015-09-21 09:19:50 +02:00
Torkel Ödegaard
feae4c6c8b
fix(ldap): fixed syncing of email and name from ldap, fixes #2765
2015-09-21 09:02:52 +02:00
Torkel Ödegaard
a23217cc6f
fix(influxdb): clear existing Authorization header when proxying request to InfluxDB, fixes #2778
2015-09-19 12:32:35 +02:00
Torkel Ödegaard
5e949b0564
fix(quota): fixed failing quota unit tests
2015-09-18 08:36:58 +02:00
Torkel Ödegaard
f9cd942363
Merge branch 'master' of github.com:grafana/grafana
2015-09-16 15:17:57 +02:00
Elliot Anderson
10c099a52d
Fixed 404 error for robots.txt
2015-09-16 11:02:50 +10:00
Torkel Ödegaard
fa0542ca8b
Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas
2015-09-15 14:33:21 +02:00
woodsaj
3926226417
fix getting default quota as map[string]int64
2015-09-15 20:31:58 +08:00
Torkel Ödegaard
6a30511fc4
Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas
2015-09-15 14:23:13 +02:00
woodsaj
1ad10914ce
add quota middleware unittests
2015-09-15 18:19:47 +08:00
woodsaj
86ed85aa6e
move toMap function to be a method on the quota structs
2015-09-15 17:18:26 +08:00
woodsaj
b7de847236
add unittests for quota sqltore methods.
2015-09-15 17:10:46 +08:00
woodsaj
3cf2cd4684
be sure to pass result obj by reference to xorm.
2015-09-15 17:10:16 +08:00
Torkel Ödegaard
64973f1d57
fix(settings): another attempt at fixing, #2736
2015-09-14 15:54:35 +02:00
Torkel Ödegaard
d7bfb727b0
fix(settings): reverted prev settings fix for detecting public_gen folder in dev, caused issue for prod build
2015-09-14 13:42:23 +02:00
Torkel Ödegaard
37ad58c69e
fix(gofmt): somehow api.go did not pass gofmt test
2015-09-14 12:30:30 +02:00
Torkel Ödegaard
d17f8538b2
fix(backend): made public_gen detection more bullet proof, #2731
2015-09-13 15:23:23 +02:00
Torkel Ödegaard
9db6f82628
refactor: finished timepicker to typescript and directive refactor
2015-09-12 12:52:50 +02:00
woodsaj
6488324cf1
enhance quota support.
...
now includes:
- perOrg (users, dashboards, datasources, api_keys)
- perUser (orgs)
- global (users, orgs, dashboards, datasources, api_keys, sessions)
2015-09-11 23:17:10 +08:00
Torkel Ödegaard
8174b9f041
fix(tests): fixed failling backend test
2015-09-11 08:58:45 +02:00
Torkel Ödegaard
fb9e91e486
Merge branch 'master' of github.com:grafana/grafana
2015-09-11 08:13:49 +02:00
Torkel Ödegaard
286b4c0e46
Merge branch 'typescript'
2015-09-11 08:01:11 +02:00
woodsaj
47bf1bd21a
return 404 when quotas not enabled.
2015-09-11 01:51:12 +08:00
woodsaj
852f9bd277
refactor quota settings
2015-09-11 01:47:33 +08:00
woodsaj
555cbeffa5
allow all users to retrieve org and quota data.
2015-09-11 01:18:36 +08:00
woodsaj
3d4d822528
implement updateQuota function
2015-09-11 01:04:29 +08:00
woodsaj
c238130842
quote table names passed by arguments
2015-09-11 01:04:22 +08:00
woodsaj
76e9ebde36
always return after errors.
2015-09-11 01:03:58 +08:00
woodsaj
0688050552
add quota middleware to enforce quotas. issue #321
...
Conflicts:
pkg/api/api.go
2015-09-11 01:03:47 +08:00
woodsaj
9023171940
inital backend suport for quotas. issue #321
...
Conflicts:
conf/defaults.ini
main.go
pkg/services/sqlstore/migrations/migrations.go
2015-09-11 01:01:36 +08:00
Mehdi Abaakouk
6e532231dc
Fix dataproxy_test.go tests
...
This change fix dataproxy_test.go tests that was failing with:
pkg/api/dataproxy_test.go:17: not enough arguments in call to NewReverseProxy
pkg/api/dataproxy_test.go:39: not enough arguments in call to NewReverseProxy
FAIL _/home/ubuntu/grafana/pkg/api [build failed]
2015-09-10 13:27:49 +00:00
Torkel Ödegaard
0b5f40e66c
tech(): made config system check for generated css or javascript files and panic if there are none, also if there is a public_gen directory it will use that, even if static root is set to public
2015-09-10 13:34:32 +02:00
Torkel Ödegaard
9603dce469
feat(dataproxy): added whitelist setting and feature for data proxies, closes #2626
2015-09-09 17:21:25 +02:00
Torkel Ödegaard
e2cb66f8d7
fix(logging): removed temp dev logging code
2015-09-08 14:32:25 +02:00
Torkel Ödegaard
fad1d4cf98
feat(organization): added update org address to http api and to org details settings view, closes #2672
2015-09-08 14:22:44 +02:00
Torkel Ödegaard
daf64421f2
fix(api): Added error handling to create and update org http apis and sql update handlers, now checks for org name taken scenarios and returns correct http error code and message, fixes #2686
2015-09-08 13:06:18 +02:00
Torkel Ödegaard
fa3329271d
fix(email notifications): added error handling to email template parsing, fixes #2690
2015-09-08 10:57:47 +02:00
Torkel Ödegaard
fdcb4473af
fix(api auth): return 401 for authentication errors and 403 for access denied errors, fixes #2693
2015-09-08 10:46:31 +02:00
Torkel Ödegaard
9e1a9723c2
Merge branch 'cloudwatch' into elastic_ds
2015-09-02 15:25:45 +02:00
Torkel Ödegaard
d56e7787f2
Merge pull request #2637 from matschaffer/env-var-output-fix
...
Iterate over the right env override list variable
2015-09-02 11:32:49 +02:00
Torkel Ödegaard
3ed63d09d9
Merge branch 'master' into cloudwatch
2015-09-01 17:25:36 +02:00
Torkel Ödegaard
aa89416bca
fix(invite): fixes to org invite stuff, #2630
2015-09-01 12:35:06 +02:00
Mat Schaffer
6c04ee1abd
Iterate over the right env override list variable
2015-09-01 11:11:54 +09:00
Torkel Ödegaard
ffbf70af25
Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch
2015-08-31 15:45:49 +02:00
Torkel Ödegaard
99bb9d4fcf
feat(signup): added back the welcome on signup completed email
2015-08-31 11:42:12 +02:00
Torkel Ödegaard
d19e101e6b
feat(signup): almost done with new sign up flow, #2353
2015-08-31 11:35:07 +02:00
Torkel Ödegaard
14884d5a2b
feat(signup): progress on new signup flow, #2353
2015-08-30 18:56:53 +02:00
Torkel Ödegaard
de0f04ec3c
feat(signup): progress on new sign up and email verification flow, #2353
2015-08-28 15:14:24 +02:00
Torkel Ödegaard
c61b22cefb
feat(signup): progress on new sign up and email verification flow, #2353
2015-08-28 13:45:16 +02:00
Torkel Ödegaard
24dfa55465
feat(signup): progress on new sign up and email verification flow, #2353
2015-08-28 09:24:30 +02:00
Torkel Ödegaard
d25624a8ad
feat(signup): began work on new / alternate signup flow that includes email verification, #2353
2015-08-27 13:59:58 +02:00
Torkel Ödegaard
ca5e8c73d7
logging(ldap): added more logging to bind failures, #2588
2015-08-24 11:47:22 +02:00
Torkel Ödegaard
3d37c9c9a3
feat(tagmanager): support to add google tagmanager id, closes #2569
2015-08-21 09:30:39 +02:00
Torkel Ödegaard
7072af7c14
fix(auth proxy): Fix for server side rendering of panel when using auth proxy, fixes #2568
2015-08-21 07:49:49 +02:00
Haneysmith, Nathan
235bbc9c7e
custom login hints via config file
2015-08-20 11:15:36 -07:00
Mitsuhiro Tanda
00f76ecaf6
CloudWatch proxy support
2015-08-20 00:51:23 +09:00
Torkel Ödegaard
01d9849e44
fix(user create): fixed for creating multiple users with empty email when auto assign org is set to false, fixes #2011
2015-08-18 20:15:24 +02:00
Torkel Ödegaard
50281f12b9
fix(default datasource): minor fix for handling of default datasource
2015-08-18 14:54:56 +02:00
Torkel Ödegaard
9a9c9b2b12
Merge branch 'query-editor-breakout'
...
Conflicts:
CHANGELOG.md
2015-08-18 08:23:13 +02:00
Torkel Ödegaard
6ee0f2c6a7
feat(mixed data source queries): lots of minor polish to new mixed data source and all the changes it has required, #436
2015-08-17 17:07:33 +02:00
Torkel Ödegaard
4a6b5274bc
feat(invite): fixes for org invite enhancement story, #2353
2015-08-17 10:55:52 +02:00
woodsaj
c138f390ac
close all existing loggers before re-initilizing loggers. fixes #2533
2015-08-17 15:59:40 +08:00
Torkel Ödegaard
a16c63a43e
feat(mixed datasources): continued work on editor design change
2015-08-16 20:52:30 +02:00
Torkel Ödegaard
16fa5c4df3
fix(mysql): fix for migration in newly added temp_user table, fixes #2509
2015-08-14 09:41:07 +02:00
Torkel Ödegaard
e6d09b3266
fix(db): remove stars and tags when removing user or dashboard, fixes #2016
2015-08-12 09:23:46 +02:00
Torkel Ödegaard
8fcaa4997d
feat(admin): Deleting org from orgs list now works, will permanently delete dashboards, data sources, etc, closes #2457
2015-08-12 08:59:39 +02:00
Torkel Ödegaard
43ef9f909a
feat(admin): admin page for all grafana organizations (list / edit view), #2457
2015-08-11 15:20:50 +02:00
Torkel Ödegaard
e01c68dcea
fix(logging): removed db connection string from being printed in logs at app startup, fixes #2488
2015-08-11 11:26:28 +02:00
Torkel Ödegaard
234d1291f9
Merge branch 'invite'
...
Conflicts:
public/css/less/gfbox.less
public/emails/reset_password.html
public/emails/welcome_on_signup.html
2015-08-11 11:22:43 +02:00
Torkel Ödegaard
1ea0b5371a
feat(invite): new user invites are now also added to correct org after sign up is completed, #2353
2015-08-11 10:45:03 +02:00
Torkel Ödegaard
74932e6311
feat(invite): added specific email for invites to existing grafana users
2015-08-11 10:35:10 +02:00
Torkel Ödegaard
835fd383ad
fix(postgres): Dashboard search is now case insensitive when using Postgres, fixes #1896
2015-08-10 20:25:01 +02:00
Torkel Ödegaard
e53c1e39d3
feat(invite): can now add org user with sername again, #2353
2015-08-10 14:03:08 +02:00
Torkel Ödegaard
775e044e69
feat(invite): progress on invite feature, #2353
2015-08-10 13:47:06 +02:00
Torkel Ödegaard
19f64bc561
fix(data source proxy): clear proxies request from cookies, fixes #2470
2015-08-10 12:11:18 +02:00
Mark Bell
e59ea1aa02
Change log file permissions from 0660 to 0644
2015-08-08 23:06:30 -04:00
Torkel Ödegaard
1f7ac11baa
feat(ldap): added support for compound search filter expressions, closes #2472
2015-08-08 10:00:49 +02:00
Torkel Ödegaard
0ed4744a33
influxdb(auth): fixed issue with using basic auth and influxdb, fixes #2455
2015-08-07 11:02:32 +02:00
Torkel Ödegaard
90400bf5ad
fix(ldap): fix for ldap users with empty email address, fixes #2461
2015-08-07 10:14:36 +02:00
Brandon Turner
1e2e65b40d
Allow default org role to be Read Only Editor
2015-08-05 23:04:47 -05:00
Torkel Ödegaard
f62d743407
fix(ldap): another fix for ldap and empty bindDN and bind password, #2339
2015-08-05 16:34:39 +02:00
Torkel Ödegaard
9dc779927b
fix(ldap): updated to ldap bindDN and bindPassword is allowed to be empty, fixes #2439
2015-08-05 16:28:15 +02:00
Torkel Ödegaard
9d25d2674b
fix(invite): fixed link in email
2015-08-04 20:23:04 +02:00
Torkel Ödegaard
6d6c9b782b
fix(ldap): minor fixes, should not have any real impact, #2421
2015-08-01 10:30:05 +02:00
Torkel Ödegaard
50895c7e37
fix(ldap): fixed issue with ldap group to grafana org role syncing, #1450
2015-07-31 16:38:41 +02:00
Torkel Ödegaard
5a160f426e
feat(invite): trying to get username to work as well
2015-07-29 09:30:23 +02:00
Dieter Plaetinck
0f7a77f45b
fix unknown key error formatting
2015-07-24 12:29:03 +02:00
Torkel Ödegaard
6d6af09296
feat(invite): handling of existing org user case when inviting, #2353
2015-07-21 12:18:11 +02:00
Torkel Ödegaard
ab54971763
feat(invite): more progress on completing invite form and actually creating a real user, #2353
2015-07-20 17:46:48 +02:00
Torkel Ödegaard
d75f96fdd5
feat(invite): more progress on invited / sigup view, #2353
2015-07-20 15:52:49 +02:00
Torkel Ödegaard
024c112944
feat(invite): redesign for pending invite list, added revoke button and link, copy invite also works now, #2353
2015-07-20 14:26:49 +02:00
Torkel Ödegaard
3242354a4b
feat(invite): worked on pending invitations list, revoke invite now works, #2353
2015-07-20 10:57:39 +02:00
Torkel Ödegaard
4ac652b127
feat(invite): began work on invited signup view, also added backdrop to login view, #2353
2015-07-19 12:34:03 +02:00
Torkel Ödegaard
6088f83408
feat(invite): inital pass on sending new user invite email, #2353
2015-07-18 17:39:12 +02:00
Torkel Ödegaard
e92f2ecea1
feat(invite): existing grafana users now result in new org user directly, no temp user is created, #2353
2015-07-18 11:43:34 +02:00
Torkel Ödegaard
a82aa8203b
Merge branch 'master' into invite
2015-07-18 10:14:45 +02:00
Torkel Ödegaard
9bf9bb0273
fix(ldap): fixed issue with ldap group mappings to org roles sync, #1450
2015-07-18 09:55:21 +02:00
Torkel Ödegaard
2724cf5db8
feat(invite): small progress
2015-07-17 14:42:49 +02:00
Torkel Ödegaard
0ffcce1b5d
feat(invite): more work on invite, basic creation works, added new tab directive from angular-ui and made new tab style, #2353
2015-07-17 09:51:34 +02:00
Torkel Ödegaard
444807c35b
feat(invite): worked on db & domain model for temp users, #2353
2015-07-16 17:59:11 +02:00
Torkel Ödegaard
5b0585ac7f
feat(ldap): removed ssl_server_name and added some validation to ldap config, #1450
2015-07-16 12:58:30 +02:00
Torkel Ödegaard
9afdea8d2a
feat(ldap): added config options for ssl skip verify, and ssl server name, #1450
2015-07-16 11:59:26 +02:00
Torkel Ödegaard
0b5ba55131
feat(ldap): work on reading ldap config from toml file, #1450
2015-07-15 10:08:23 +02:00
Torkel Ödegaard
262a09bb2d
feat(ldap): added support for binding initially with an admin user searching for user and then binding again to authenticate current user, #1450
2015-07-14 17:35:11 +02:00
Torkel Ödegaard
0320baeb5b
feat(ldap): user org role sync working
2015-07-14 16:42:55 +02:00
Torkel Ödegaard
42670c27d5
feat(ldap): more work on org role sync
2015-07-14 15:46:11 +02:00
Torkel Ödegaard
fe41a4e6fa
feat(ldap): began work on org role sync
2015-07-14 14:29:07 +02:00
Torkel Ödegaard
a7b1df34c5
feat(ldap): more unit tests for ldap to grafana user sync
2015-07-14 10:20:30 +02:00
Torkel Ödegaard
2fa9311eee
Progress on ldap support, #1450
2015-07-13 16:45:47 +02:00
Torkel Ödegaard
14f439f8ba
refactor(ldap): refactoring ldap code, #1450
2015-07-13 15:37:25 +02:00
Torkel Ödegaard
bfe7b77313
More work on ldap auth, got memberOf working in the docker ldap test server, playing with config options and structures, #1450
2015-07-13 14:23:59 +02:00
Torkel Ödegaard
db1847bc1d
More work on ldap, gotten ldap search (read attributes) to work
2015-07-10 15:29:34 +02:00
Torkel Ödegaard
0ef7271326
Started work on LDAP again, #1450
2015-07-10 11:10:48 +02:00
Dieter Plaetinck
66ba19b7ba
clearer errors
...
"Not found" should only be for http path/method not found (404)
if it's about specific resources, we should be explicit for clarity
2015-07-08 08:55:31 +02:00
Torkel Ödegaard
aedaae852b
Fixed minor mistake in last commit
2015-06-30 12:14:13 +02:00
Torkel Ödegaard
ae0f8c77d1
Auth: You can now authenicate against api with username / password using basic auth, Closes #2218
2015-06-30 09:37:52 +02:00
Torkel Ödegaard
d0e7d53c69
Fixed case insensitive search for file based dashboards, Fixes #2258
2015-06-30 08:17:28 +02:00
Torkel Ödegaard
647e43dcbd
Merge pull request #2259 from donnpebe/fix
...
Fix wrong metrics counter
2015-06-30 08:07:04 +02:00
Torkel Ödegaard
0d856cc135
Error message for missing dashboards.json config section, Closes #2256
2015-06-30 08:05:05 +02:00
Donn Pebe
df33cbc8c5
Fix wrong metrics counter
2015-06-30 12:52:55 +07:00
Dieter Plaetinck
194273a643
clarify which handler is not found
2015-06-26 12:32:24 -07:00
Torkel Ödegaard
24bab47f14
fix(create org): Anonymous user can no longer create org, Fixes #2227
2015-06-25 17:06:43 +02:00
Torkel Ödegaard
3f917b0af5
Updated org creation view, after creating new org user is switched to that org and redirect to org details view, Closes #2198
2015-06-22 08:13:21 +02:00
Torkel Ödegaard
fb7b475457
Backend: Load dashboards with capital letters in the dashboard url slug (url id), Fixes #2163
2015-06-19 14:42:55 -04:00
Torkel Ödegaard
26e5d7a3de
Graph: fixed PNG rendering of panels with legend table to the right, #2185
2015-06-19 14:13:25 -04:00
Anthony Woods
196b7846cc
add support for robots.txt file
2015-06-15 19:02:38 -04:00
Torkel Ödegaard
311946900e
Fixed email subject test
2015-06-14 06:08:18 +02:00
Torkel Ödegaard
9b12350855
Added support for templated email subjects
2015-06-14 06:07:36 +02:00
Torkel Ödegaard
66e60357dc
Set email when creating user from auth_proxy header, Fixes #2156
2015-06-13 20:14:44 +02:00
Torkel Ödegaard
bae1e2f0c1
Fix for validating tags in dashboard json in backend, Fixes #2152
2015-06-12 09:04:10 +02:00
Torkel Ödegaard
7ce31bfaa0
changed dependency for gosimple/slug, they had finally removed the gopkgs dependency, Fixes #2153
2015-06-12 08:53:20 +02:00
Torkel Ödegaard
3675b3fcaa
Fixed issue with clearing admin permissions, Fixes #2143
2015-06-11 08:29:12 +02:00
Torkel Ödegaard
5962bcbc6c
Do not show create org link when allow_org_create is set to false, Fixes #2135
2015-06-11 08:16:09 +02:00
Torkel Ödegaard
b5418c40ba
fixed AMPQ -> AMQP typo
2015-06-10 14:44:42 +02:00
Torkel Ödegaard
2266ef6809
Minor api refactoring / code clean up
2015-06-10 10:15:42 +02:00
Torkel Ödegaard
bb2d810709
Final work password reset email, Closes #1456
2015-06-08 18:25:04 +02:00
Torkel Ödegaard
db0c442eaf
Added configuration options for smtp
2015-06-08 17:56:56 +02:00
Torkel Ödegaard
42fc68baa5
Simplified emailing system and combined mailer and notifications packages
2015-06-08 16:51:25 +02:00
Torkel Ödegaard
c8bc0b3bf8
Lots of work on user password reset, #1456
2015-06-08 13:39:02 +02:00
Torkel Ödegaard
aa4d60c21e
Worked on reset password views, refactored out password strength to a reusable directive
2015-06-08 10:57:01 +02:00
Torkel Ödegaard
89418a155a
More work on email and notification infra #1456
2015-06-05 11:08:19 +02:00
Torkel Ödegaard
c709a28f02
More work on email and notification infra #1456
2015-06-05 08:15:38 +02:00
Torkel Ödegaard
3706d0dedd
More work on email and notification infra #1456
2015-06-04 17:23:46 +02:00
Torkel Ödegaard
3f5ab189cd
Began work on emailing service #1456
2015-06-04 14:29:39 +02:00
Torkel Ödegaard
eb793f7feb
Initial work on ldap support, #1450
2015-06-04 09:34:42 +02:00
Torkel Ödegaard
2c7d33cdfa
Merge branch 'master' into ldap
2015-06-03 14:54:48 +02:00
Torkel Ödegaard
83279604c6
updated search handler
2015-06-03 14:53:52 +02:00
Torkel Ödegaard
50a1feb90a
Dashboard list panel: Now supports search by multiple tags, Closes #2096
2015-06-02 11:04:06 +02:00
Torkel Ödegaard
dc607b8e8a
Dashboard search now supports filtering by multiple dashboard tags, Closes #2095
2015-06-02 10:24:20 +02:00
Torkel Ödegaard
2446168356
Sort tags in search results, Closes #2091
2015-06-02 09:00:37 +02:00
Torkel Ödegaard
ff3843bc7f
Roles: New user role that replaces the old role behavior, Closes #2088
2015-06-01 17:01:04 +02:00
Torkel Ödegaard
85c3a0aa14
Panel menu now hides edit actions for users with role Viewer, Closes #1826
2015-06-01 16:36:15 +02:00
Torkel Ödegaard
e2f6633d57
Began work on data source test / validation, #1997 & #2043
2015-06-01 12:15:49 +02:00
Torkel Ödegaard
fc43ce657c
allow data source proxy to proxy requests over self signed https connections, Closes #2069
2015-06-01 11:00:29 +02:00
Andrea Bernardo Ciddio
cf147cdeaf
GitHub users without a public email should be authenticated using their primary private email address
2015-05-28 16:47:20 +01:00
Torkel Ödegaard
5f004f95f2
Fixed issue with json dashboard index, json file dashboards turned up when filtering on 'is starred'
2015-05-25 15:42:59 +02:00
Torkel Ödegaard
abed438d7d
Merge pull request #2052 from indrekj/org-support
...
Add github organizations support
2015-05-25 14:16:46 +02:00
Brandon Turner
b2a0ae0f83
Render panel images with any SSL protocol
...
This uses any available SSL protocol (instead the phantomjs default:
SSLv3) to render panels to PNGs. This is useful when reverse proxing
grafana and SSLv3 is disabled due to security vulnerabilities or other
reasons.
2015-05-25 01:52:49 -05:00
Indrek Juhkam
b55d9350e7
Add github organizations support
2015-05-23 17:06:51 +03:00
Torkel Ödegaard
592330b5a7
Expose data source extended properties (jsonData), to the frontend, Closes #2023
2015-05-20 18:29:20 +02:00
Torkel Ödegaard
3354365177
Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling
2015-05-20 14:59:38 +02:00
Torkel Ödegaard
51af06edf7
Merge pull request #2022 from dalmatinerdb/proxy-url-fix
...
fixing #2021
2015-05-20 09:03:23 +02:00
Heinz N. Gies
7cf9046dc5
fixing #2021
...
This tiny commit fixes a routing problem for proxy requests. The
router was expecting a url path behind the proxy id, if none was
given (read: the service proxied was at the root of a host) then
the router would return a 404. With this patch it now propperly
uses ProxyDataSourceRequest.
2015-05-19 23:49:30 +02:00
Torkel Ödegaard
a8aab0cb2b
Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014
2015-05-19 11:47:14 +02:00
Torkel Ödegaard
788e7fd36d
Lots of api refactoring for org routes, #2014
2015-05-19 10:16:32 +02:00
Torkel Ödegaard
74bf1f23fb
Small progress on #2014
2015-05-19 09:09:21 +02:00
Torkel Ödegaard
bf9e51928d
Fix to signed in user when user <-> org link is gone
2015-05-19 09:02:37 +02:00
Torkel Ödegaard
f81bde5643
Refactoring some api handlers to use the new Response return object
2015-05-18 21:23:40 +02:00