IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,967 Commits 5,454 Branches 554 Tags 1.9 GiB
d0d995da09
Commit Graph

2967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ed0fabd9de Fixed css issue with sidenav not extending to bottom of page when dashboard requires scrolling, #1483 2015-02-14 09:05:35 +01:00
Torkel Ödegaard
0767992662 fixed z-index pos for panel-menu compared to dashboard search dropdown, #1483 2015-02-14 08:40:15 +01:00
Torkel Ödegaard
a88187023d Added a sql integration test for api keys 2015-02-13 15:55:32 +01:00
Torkel Ödegaard
57dc12ee17 Merge pull request #1482 from raintank/issue_1481 
fixes #1481.  correctly escape api_key.key column name
 2015-02-13 15:47:12 +01:00
woodsaj
c9e5da48a4 Merge branch 'issue_1481' of github.com:raintank/grafana into issue_1481 2015-02-13 22:00:57 +08: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
woodsaj
55ba8ad0c4 fix issue 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 21:52:56 +08:00
Torkel Ödegaard
6263ec1d38 Fixed some playlist issues, error when adding duplicates 2015-02-13 14:36:16 +01:00
Torkel Ödegaard
1d86d4b94f Updated docker build, added test container script, added docker readme 2015-02-13 14:18:37 +01:00
Torkel Ödegaard
8aef2c13ec Worked on playlist mode, hides dashboard controls and dashboard search button, added prev, stop, next icon buttons 2015-02-13 09:31:40 +01: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
29607d8951 Updated readme again 2015-02-12 13:45:53 +01:00
Torkel Ödegaard
366a9f71ad Updated readme build instructions 2015-02-12 13:44:22 +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
Torkel Ödegaard
2a31f16b76 Merge pull request #1467 from jwilder/jw-fixes 
Small fixes to getting up and running
 2015-02-12 02:26:54 +01:00
Jason Wilder
793eda7640 Assign new dashboard ID when importing dashboard via command-line 2015-02-11 15:20:36 -07:00
Jason Wilder
8230279932 Assign new ID to when importing dashboard via frontend 
Fixes a panic: interface conversion: interface is string, not float64
when importing a dashboard that has a non-float ID.
 2015-02-11 15:20:18 -07:00
Jason Wilder
a6df991b76 Update README.md w/ known working build tool versions 2015-02-11 14:55:26 -07:00
Jason Wilder
9cc0be0fc2 Add grafana binary to .gitignore 
Running "go build" defaults to building a binary named
grafana in the root dir.
 2015-02-11 14:55:26 -07:00
Torkel Ödegaard
0d0d802526 Removed data folder stuff, should not be in repo 2015-02-11 21:21:21 +01:00
Torkel Ödegaard
71f09ddd94 Added delete user action to user admin api, and made it work in UI, Closes #1466, #1446 2015-02-11 16:47:22 +01:00
Torkel Ödegaard
17f1224a5d Fixed light theme condition, Fixes #1462 2015-02-11 15:32:19 +01:00
Torkel Ödegaard
441e2ad2f3 Updated dockerfile and moved to docker/production folder 2015-02-11 13:53:42 +01:00
Torkel Ödegaard
39a6bf9784 Updated readme with info about the Grafana 2.0 develop branch 2015-02-10 19:38:55 +01:00
Torkel Ödegaard
8d130421c4 Updated readme with default admin user info 2015-02-10 17:10:07 +01:00
Torkel Ödegaard
add4adeec9 Fixed links to user admin views, and backend html routes for user admin edit/create urls, Closes #1451 2015-02-10 16:26:23 +01:00
Torkel Ödegaard
e165e2af95 Worked on user admin features, can now create and edit users as a grafana admin user, #1446 2015-02-10 15:36:51 +01:00
Torkel Ödegaard
088ad881e0 Updated phantomjs panel rendering code 2015-02-10 11:13:35 +01:00
Torkel Ödegaard
c5afcd8e09 Fixed issue with datasource proxying, it required account admin role when it should not 2015-02-10 10:19:43 +01:00
Torkel Ödegaard
5c795e9a50 Updated readme with docker info, updated build task 2015-02-09 16:18:30 +01:00
Torkel Ödegaard
cd8f938cab Fixed issue with sidenav toggle on non dashboard pages 2015-02-09 16:02:42 +01:00