public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 2ae0ef94de Merge branch 'tsdb_downsample' of https://github.com/frogmaster/grafana into frogmaster-tsdb_downsample 2015-02-23 11:45:30 +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 12e28c1895 added missing file 2015-02-23 11:24:45 +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 15c52cacfb Import views are now consolidated into one view, and found through one navigation (dashboard search -> Import, Closes #1511 2015-02-23 10:50:50 +01:00
Torkel Ödegaard 4a93d205bb Moved dashboard import and json import to same view, found via dashboard search dropdown, #1511 2015-02-23 10:13:16 +01:00
Torkel Ödegaard a146a24c06 Fixed small issue in search and showing Home dashboard when filtering by tag 2015-02-23 09:54:26 +01:00
Torkel Ödegaard 6347b9b0d7 Merge remote-tracking branch 'origin/develop' into develop 2015-02-22 08:45:44 +01:00
Torkel Ödegaard fea6b970e5 Some prep work for using today as relative time, #1186 2015-02-22 08:44:37 +01:00
Torkel Ödegaard afeaa9fecd Merge pull request #1507 from ryan-williams/typos 
typo fixes, .gitignore tweak
 2015-02-22 08:31:24 +01:00
Torkel Ödegaard 7e82626b17 Fixed bug with custom time range not being initialized correctly, Fixes #1427 2015-02-22 08:25:44 +01:00
Torkel Ödegaard 9b9aab27ca Graphs now update/refresh when you edit annotations, Fixes #1430 2015-02-22 08:09:58 +01:00
Torkel Ödegaard 31e5271921 Fixed number formating issue when InfluxDB return MAX float64, Fixes #1402 2015-02-22 07:44:40 +01:00
Torkel Ödegaard 8c977e37a9 Merge remote-tracking branch 'origin/master' into develop 
Conflicts:
	README.md
 2015-02-21 21:22:09 +01:00
Torkel Ödegaard 9c8134f8bc Dashboard: Fixed memory leak when switching dashboards, Fixes #1497 2015-02-21 21:19:51 +01:00
Ryan Williams 36ec15be8f fix some scripted-dashboard-comment typos 2015-02-20 19:51:23 +00:00
Ryan Williams c29bf31f2b add intellij files to gitignore 2015-02-20 19:51:21 +00:00
Torkel Ödegaard 5b1727bcba Graph & Singlestat: Support for additional units, Fahrenheit (°F) and Celsius (°C), Humidity (%H), kW, watt-hour (Wh), kilowatt-hour (kWh), velocities (m/s, km/h, mpg, knot), Closes #1366 2015-02-20 14:45:00 +01:00
Torkel Ödegaard 7a14054057 Graph: Shared tooltip improvement, can now support metrics of different resolution/intervals, Closes #978, Fixes #1499 2015-02-20 14:07:24 +01:00
Torkel Ödegaard 481a4b0f1b Small fix to unsavedChangesSrv, did not handle new template variable correctly 2015-02-20 12:25:54 +01:00
Torkel Ödegaard fe34c8f2e0 Worked on submenu row (templating, annotations), removed templating and annotation feature toggles, the submenu row will be visible as soon as there are any template vars or annotations, #1503 2015-02-20 12:20:10 +01:00
Torkel Ödegaard 923e18b2b9 Small design change for the submenu (templating, annotations), #1503 2015-02-20 11:27:57 +01:00
Torkel Ödegaard 596dfc304d Added guard for template variables missing query field, Fixes #1501 2015-02-20 10:45:23 +01:00
Torkel Ödegaard 47c6c6e1b7 Added change password feature, Closes #1455 2015-02-19 16:09:49 +01:00
Torkel Ödegaard afc52f57a2 small fix to confirm modal 2015-02-19 10:42:13 +01:00
Torkel Ödegaard 0786977bcf Fixed css issue with sidebar 2015-02-19 10:15:24 +01:00
Torkel Ödegaard 181542249d Fixed failing influxdb-datasource test 2015-02-18 16:09:17 +01:00
Torkel Ödegaard 0d165e67c9 Fixed issue with influxdb, broken in recent commit today 2015-02-18 15:22:45 +01:00
Torkel Ödegaard 978b12b0dc Close dashboard edit views when clicking on dashboard title, added some tooltips to dashboard top nav 2015-02-18 15:17:31 +01:00
Torkel Ödegaard 2ca849c0c4 Changed docker image to debian:jessie 2015-02-18 14:43:58 +01:00
Torkel Ödegaard 3991d9dc06 Added error handling to dashboard imports, #1493 2015-02-18 14:18:54 +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 4ed54f6aa9 Force full reload when switching account, temp fix for refreshing frontend datasource, settings, and user account role 2015-02-18 13:18:29 +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 596ce18aeb Worked on clone dashboard feature, #1488 2015-02-18 10:44:44 +01:00
Torkel Ödegaard 5c9ef9d9da Added form validation and css class for invalid timespans, #1494 2015-02-18 09:20:46 +01:00
Torkel Ödegaard ad13fd0542 Added validation for correct timespans when using panel timeshift or relative time override, Fixes #1494 2015-02-18 09:08:12 +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 946afccbb5 Fixed dashboard search dropdown issue where it closes dashboard settings view if open, also fixed so that clicking outside dashboard search will close it, Fixes #1489 2015-02-17 18:20:47 +01:00
Torkel Ödegaard ea8307f79e Added influxdb docker block, and fixed issue when adding data source 2015-02-17 11:44:58 +01:00
Torkel Ödegaard 83d798dbad Small update to grafana.ini describe server options 2015-02-16 08:12:07 +01:00
Torkel Ödegaard 7f5f6763ea Fixed icon for ascending sort order in table legend, #1483 2015-02-16 07:52:16 +01:00
Torkel Ödegaard 8828db4fce Fixed issue with date range form validation, Closes #1485 2015-02-16 07:46:47 +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