IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,941 Commits 5,454 Branches 554 Tags 1.9 GiB
7c241fd617
Commit Graph

236 Commits

Author SHA1 Message Date
Torkel Ödegaard
7c241fd617 Added permissions section to admin > edit user view, an admin can now make another user admin, Closes #1517 2015-02-26 15:43:48 +01:00
Torkel Ödegaard
ae7f18f981 Made a copy of influxdb datasource named influxdb_08 so the main influxdb data source can be modified to support InfluxDB 0.9, made some initial experiments to get queries to work, but a lot more work is needed, #1525 2015-02-25 18:43:44 +01:00
Torkel Ödegaard
3f96afba73 Merge branch 'fixDashboardDelete' of https://github.com/raintank/grafana into raintank-fixDashboardDelete 
Conflicts:
	pkg/services/sqlstore/dashboard.go
 2015-02-25 14:31:44 +01:00
Torkel Ödegaard
9e789e6d82 More work on organization / admin nav, views, #1506 2015-02-25 14:27:34 +01:00
Torkel Ödegaard
563d5e3ad8 All migrations work in sqlite3, mysql and postgres 2015-02-25 07:57:51 +01:00
Torkel Ödegaard
16fd256225 Added missing common.go 2015-02-24 19:10:41 +01:00
Torkel Ödegaard
f3f79792ab account -> org table migration is starting to work, need to test mysql and postgres 2015-02-24 18:32:29 +01:00
Torkel Ödegaard
ed68a4bb9a More work on SQL migrations 2015-02-24 17:59:21 +01:00
Torkel Ödegaard
02a89c752b Progress on database schema migration for account -> org refactor 2015-02-24 11:46:34 +01:00
Anthony Woods
b9b63f695d fixes #1518 fix table name used in dashboard delete. 2015-02-24 08:56:10 +00:00
Torkel Ödegaard
da41d99aa7 Fixed sql integration test 2015-02-23 20:48:43 +01:00
Torkel Ödegaard
26e4809e2e Big Backend Refatoring: Renamed Account -> Org 2015-02-23 20:07:49 +01:00
Torkel Ödegaard
e9e2fa2927 Started Account -> Organization rename 2015-02-23 18:29:01 +01:00
Torkel Ödegaard
5b2715515f Began work on Account -> Organization rethink, #1506 2015-02-23 16:40:04 +01:00
Torkel Ödegaard
a8c90e2365 Small update to commands 2015-02-23 14:20:24 +01:00
Torkel Ödegaard
138e720695 Increased max user list to 1000 for user admin page, need to paging, but will have to wait a few days 2015-02-23 11:30:58 +01:00
Torkel Ödegaard
1a106e5c38 Added change password ability to admin > edit user view, #1446 2015-02-23 11:24:22 +01:00
Torkel Ödegaard
47c6c6e1b7 Added change password feature, Closes #1455 2015-02-19 16:09:49 +01:00
Torkel Ödegaard
60ae4afe87 Refresh frontend datasourceSrv after datasource update, no longer need to reload the page to use a newly added or updated datasource, #1493 2015-02-18 14:06:44 +01:00
Torkel Ödegaard
17004ce3ae Fixed issue with login by username and uppercase letters in username, #1484 2015-02-18 13:00:39 +01:00
Torkel Ödegaard
26eb6e559e Removed use of absolute urls in dashboard search and dashlist, root_url option is now not required, it is required if you use oauth or proxy grafana under suburl, #1483 2015-02-17 18:43:37 +01:00
Torkel Ödegaard
83d798dbad Small update to grafana.ini describe server options 2015-02-16 08:12:07 +01:00
Torkel Ödegaard
56d8fe4a22 Small changes to CLI commands PR 2015-02-16 07:40:21 +01:00
Jason Wilder
b6428b08d0 CLI: Fix config flag being ignored 
Passing --config had no effect when passed.  It will now be applied as
the last config file and before any env var overrrides.
 2015-02-15 15:06:02 -07:00
Jason Wilder
9223c95481 CLI: Order commands alphabetically 2015-02-15 14:01:48 -07:00
Jason Wilder
a3925e8aa0 CLI: Use console logger for dashbard:import command 
More consistent w/ other commands and separates stdout/stderr
 2015-02-15 13:51:41 -07:00
Jason Wilder
7c8fa067a2 CLI: Conver account flag to required arg 
Follows the same convention as other commands.
 2015-02-15 13:48:36 -07:00
Jason Wilder
f2e9ec63df CLI: Renamed import-json to dashboard:import 
More consistent w/ other command names.
 2015-02-15 13:45:25 -07:00
Jason Wilder
b97361b193 CLI: Add datasource:delete command 2015-02-15 13:36:10 -07:00
Jason Wilder
22652889b2 CLI: Add datasource:create command 
Allows creating a datasource from the command line
 2015-02-15 13:36:10 -07:00
Jason Wilder
04a970eda2 CLI: Use 8 char min col size instead of 20 2015-02-15 13:36:10 -07:00
Jason Wilder
f443b7087c CLI: Add datasource:info command 
Describes the full datasource details given an account and
datasource name.
 2015-02-15 13:36:10 -07:00
Jason Wilder
9cb1170361 CLI: Move duplicated config flag to global flag 2015-02-15 13:36:10 -07:00
Jason Wilder
dda760b9b5 CLI: Add datasource list command 
Lists all the datasources for an account via the CLI
 2015-02-15 13:36:10 -07:00
Jason Wilder
ca4124940a CLI: Remove redundant Cmd prefix from commands 2015-02-15 13:36:10 -07:00
Jason Wilder
90cd10e034 CLI: Add account:delete command 2015-02-15 13:36:10 -07:00
Jason Wilder
c1d4acc01e CLI: Use colorized console output 
This extracts some of the colored logging functionality into some
convenience functions to log directly to the console (stdout) w/o
the usual logging prefixes and flags.  It's intended for console
messages when using grafana commands.
 2015-02-15 13:36:10 -07:00
Jason Wilder
81531a29eb CLI: Add account:create command 
Creates a new account attached to the default admin account for now.
 2015-02-15 13:36:10 -07:00
Jason Wilder
7d4c319fcb CLI: Default logging output to stderr instead of stdout 
Makes it possible to separate console output from logging output so
command output can be piped to a file cleanly.
 2015-02-15 13:36:10 -07:00
Jason Wilder
ca37b24455 CLI: Add account list command 2015-02-15 13:36:10 -07:00
Torkel Ödegaard
f6c07fdabd Rewrote and redesign how the data source edit views look and work so they conform better to how account views look, removed tabs and put top nav items to add data source etc, made list, edit and new seperate url routes, #1483 2015-02-14 10:04:34 +01:00
Torkel Ödegaard
a88187023d Added a sql integration test for api keys 2015-02-13 15:55:32 +01:00
woodsaj
7d69885e06 fixes #1481. correctly escape api_key.key column name 
'key' is a reserved word in mysql. So when building a query,
the api-key.key column name needs to be escaped
 2015-02-13 22:00:03 +08:00
Torkel Ödegaard
8722ee8ad6 Worked on playlist update for Grafana 2.0, added dashboard search to playliststart view, #1460 2015-02-13 08:47:44 +01:00
Torkel Ödegaard
1a44036148 Fixed req.Host in datasource proxy, Fixes #1478 2015-02-13 07:26:33 +01:00
Torkel Ödegaard
e65a6cc063 added an inital admin settings view, very basic right now only displays all config options in grafana.ini 2015-02-12 15:46:14 +01:00
Torkel Ödegaard
79f798f67b Configuration file options can now be overriden using environment variables using GF_<SectionName>_<KeyName> syntax, if Section name contains dots in config they are replaced with underscores, and the section name and keyname needs to be all upper case, #1473 2015-02-12 13:31:41 +01:00
Torkel Ödegaard
2c16b0f0f3 added unit test for loading configuration file 2015-02-12 11:55:55 +01:00
Torkel Ödegaard
4df6668416 Merge branch 'develop' of github.com:grafana/grafana into develop 2015-02-12 10:34:52 +01:00
Torkel Ödegaard
0140a00884 Added two columns to user table, email_verified and theme, no used right now but will probably shortly 2015-02-12 10:32:22 +01:00