Matt Bostock
f6aa0e41e5
Return error if datasource TLS CA not parsed
2017-10-11 08:18:03 +01:00
Matt Bostock
e23c678df9
Datasource settings: Make HTTP all caps
...
It's an acronym, so it should be all caps.
2017-10-11 08:18:03 +01:00
Matt Bostock
5d312be419
Datasource HTTP settings: Add TLS skip verify
...
In c04d95f35 I changed the default for datasource HTTP requests so that
TLS is always verified.
This commit adds a checkbox to allow an admin to explicitly skip TLS
verification, for testing purposes.
2017-10-11 08:18:03 +01:00
Matt Bostock
ef52d956bf
Make URL capitalisation consistent in UI
...
URL is an acronym, it should be all caps.
2017-10-11 08:18:03 +01:00
Matt Bostock
a286ffa5f2
Alias macron package in app_routes.go
...
...to make this file compatible with goimports:
https://godoc.org/golang.org/x/tools/cmd/goimports
2017-10-11 08:18:03 +01:00
Matt Bostock
43169e4302
Verify datasource TLS and split client auth and CA
2017-10-11 08:18:03 +01:00
Matt Bostock
4719a8c8dd
Tidy spacing in datasource TLS settings
2017-10-11 08:18:03 +01:00
Matt Bostock
592c46c8b5
Tests: Clarify what InsecureSkipVerify does
2017-10-11 08:18:03 +01:00
bergquist
0c31c7b106
changelog: add note about closing #7175
2017-10-04 10:42:34 +02:00
Carl Bergquist
ba074062d6
Merge pull request #9392 from xginn8/slack_image_upload
...
adding support for token-based slack file.upload API call for posting images to slack
2017-10-04 10:29:15 +02:00
Daniel Lee
3c1beb1bdd
plugin_loader: expose app_events to plugins
2017-10-04 09:41:22 +02:00
Torkel Ödegaard
be3c5d1355
colorpicker: refactoring the new unififed colorpicker, #9347
2017-10-04 07:56:41 +02:00
Alexander Zobnin
2aae2556a5
Unified colorpicker ( #9347 )
...
* colorpicker: initial picker with predefined palette and spectrum
* colorpicker: highlight selected color
* colorpicker: add onChange() callback
* colorpicker: replace singlestat picker by new one
* colorpicker: style tweak
* colorpicker: parse color on input blur
* colorpicker: sort palette by hue and lightness
* colorpicker: refactor, move colors sorting to 'app/core/utils/colors'
* tech: colorpicker - fix linter errors
* colorpicker: convert to React components
* colorpicker: fix spectrum import after moving to webpack
* colorpicker: minor refactor
* colorpicker: initial series color picker
* colorpicker: fix tests error
2017-10-04 07:15:23 +02:00
Dan Cech
7859d4ffca
fix missing column headers in excel export ( #9413 )
2017-10-04 07:04:10 +02:00
Torkel Ödegaard
1af00f5209
build: remove clean plugin from dev build
2017-10-03 20:25:47 +02:00
Torkel Ödegaard
0831238420
build: fixed broken elastic unit test
2017-10-03 19:38:52 +02:00
Torkel Ödegaard
a1b543aa35
shore: cleanup unused stuff in common.d.ts
2017-10-03 18:27:25 +02:00
Patrick O'Carroll
e1a86e63b8
some restyling ( #9409 )
2017-10-03 13:35:12 +02:00
Patrick O'Carroll
dd83b67de5
Docs text fixes ( #9408 )
...
* styling changes and some text changes
* styling changes
2017-10-03 13:34:52 +02:00
Patrick O'Carroll
50e2f7e366
Checkbox fixes ( #9400 )
...
* fixing checkboxes
* deleted old file, fixed checkboxes
* minor change
2017-10-03 13:23:05 +02:00
Torkel Ödegaard
3dac77468b
fix: ensure panel.datasource is null as default
2017-10-03 12:18:22 +02:00
Torkel Ödegaard
4c4564b138
plugibs: expose more to plugins
2017-10-03 11:02:40 +02:00
Matthew McGinn
be0d471467
properly parse & pass upload image bool from config
2017-10-02 23:18:48 -04:00
Matthew McGinn
122e2b5c42
break out slack upload into separate function
2017-10-02 20:48:35 -04:00
Torkel Ödegaard
a365719d3f
tech: minor npm scripts update
2017-10-02 17:25:43 +02:00
Torkel Ödegaard
4cc878b56d
build: fixed build
2017-10-02 17:10:23 +02:00
Torkel Ödegaard
fa79be1f2d
Merge branch 'ctide-day_rounding2'
2017-10-02 16:45:44 +02:00
Torkel Ödegaard
a02cac2126
refactoring: minor refactoring of PR #8916
2017-10-02 16:45:25 +02:00
Torkel Ödegaard
42a0e9ebdf
Merge branch 'day_rounding' of https://github.com/ctide/grafana into ctide-day_rounding2
2017-10-02 16:20:23 +02:00
Torkel Ödegaard
d4e5a7d3f0
Merge branch 'master' of github.com:grafana/grafana
2017-10-02 15:30:50 +02:00
Torkel Ödegaard
503336bcd5
docs: minor docs fix
2017-10-02 15:30:37 +02:00
Torkel Ödegaard
03a88206a3
Merge branch 'master' of github.com:grafana/grafana
2017-10-02 15:30:14 +02:00
Torkel Ödegaard
ae14655749
plugins: expose datemath to plugins as well, fixes zabbix plugin
2017-10-02 13:39:39 +02:00
Torkel Ödegaard
c338d8250b
build: minor webpack fix
2017-10-02 13:15:28 +02:00
Patrick O'Carroll
bd348e16bb
redesigned dashboard links settingd, fixed a misspelling in rows and added fixed width to buttons ( #9397 )
2017-10-02 13:04:48 +02:00
Torkel Ödegaard
010a29a42d
Merge branches 'master' and 'master' of github.com:grafana/grafana
2017-10-02 10:56:12 +02:00
Torkel Ödegaard
38ae460f59
docs: updated building from source docs
2017-10-02 10:55:56 +02:00
bergquist
cb0ded069a
playlist: play and edit should use same width
2017-10-02 09:58:58 +02:00
Torkel Ödegaard
f5e8a4069c
docs: minor fixes for #9369
2017-10-02 09:02:58 +02:00
Torkel Ödegaard
1dea7dab2a
shore: fixed html indentation, #9368
2017-10-02 08:51:45 +02:00
Torkel Ödegaard
a22dded6fa
Merge branch 'update-alert-lists' of https://github.com/Ijin08/grafana into Ijin08-update-alert-lists
2017-10-02 08:43:56 +02:00
Torkel Ödegaard
6bc6911293
tech: updated yarn.lock
2017-10-02 08:24:56 +02:00
Torkel Ödegaard
fea741d7c2
shore: minor cleanup
2017-10-01 20:35:01 +02:00
Torkel Ödegaard
0c86241c5b
Webpack ( #9391 )
...
* webpack poc, this is not going to work for plugins, dam
* tech: webpack and systemjs for plugins starting to work
* tech: webpack and systemjs combo starting to work
* tech: webpack + karma tests progress
* tech: webpack + karma progress
* tech: working on tests
* tech: webpack
* tech: webpack + karma, all tests pass
* tech: webpack + karma, all tests pass
* tech: webpack all tests pass
* webpack: getting closer
* tech: webpack progress
* webpack: further build refinements
* webpack: ng annotate fixes
* webpack: optimized build fix
* tech: minor fix for elasticsearch
* tech: webpack + ace editor
* tech: restored lodash move mixin compatability
* tech: added enzyme react test and upgraded to react v16
* tech: package version fix
* tech: added testdata to built in bundle
* webpack: sass progress
* tech: prod & dev build is working for the sass
* tech: clean up unused grunt stuff and moved to scripts folder
* tech: added vendor and manifest chunks, updated readme and docs
* tech: webpack finishing touches
2017-10-01 20:02:25 +02:00
Matthew McGinn
89ca4b247b
fixing json for CI
2017-10-01 10:37:59 -04:00
Matthew McGinn
00726e93eb
adding support for token-based slack file.upload API call for posting images to slack
2017-09-30 21:20:20 -04:00
bergquist
f6cc741a6d
changelog: adds note about closing #8479
2017-09-29 15:43:30 +02:00
Carl Bergquist
8a7f87b752
Merge pull request #9311 from ctrlok/ctrlok/pagerdutyinfo
...
Include triggering metrics to pagerduty alerts (pretty print)
2017-09-29 15:40:49 +02:00
bergquist
46cc1464c4
changelog: adds note about closing #8050
2017-09-29 13:40:07 +02:00
Carl Bergquist
cabb21317f
Merge pull request #8050 from mtanda/cloudwatch_alert
...
(cloudwatch) alerting
2017-09-29 13:36:36 +02:00
