From 70d536c6c470b20f45e86d6ea8c2e3080898abc9 Mon Sep 17 00:00:00 2001 From: Trent White Date: Fri, 25 Mar 2016 11:54:50 -0400 Subject: [PATCH 1/5] add card style css for dashlist panels and remove dark border on dashlist items to match the dropdown dashboard picker list --- public/sass/components/_panel_dashlist.scss | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/public/sass/components/_panel_dashlist.scss b/public/sass/components/_panel_dashlist.scss index f00b59735c1..5e75c73e12d 100644 --- a/public/sass/components/_panel_dashlist.scss +++ b/public/sass/components/_panel_dashlist.scss @@ -1,3 +1,17 @@ +panel-plugin-dashlist .panel-container { + border-radius: 4px; + border:none; + box-shadow: $card-shadow; + .panel-header { + text-align: left !important; + font-size: 1.25rem; + padding: 0 20px 10px 20px; + .panel-title { + font-weight: 400; + } + } +} + .dashlist-item { } @@ -7,7 +21,6 @@ margin: 5px; padding: 7px; background-color: $tight-form-bg; - border: 1px solid $tight-form-border; .fa { float: right; padding-top: 3px; From 90c79432428fb26f03cb88bdf55f254ca95a310e Mon Sep 17 00:00:00 2001 From: Trent White Date: Fri, 25 Mar 2016 12:12:46 -0400 Subject: [PATCH 2/5] backing out card style on dashlist --- public/sass/components/_panel_dashlist.scss | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/public/sass/components/_panel_dashlist.scss b/public/sass/components/_panel_dashlist.scss index 5e75c73e12d..a69d1654e04 100644 --- a/public/sass/components/_panel_dashlist.scss +++ b/public/sass/components/_panel_dashlist.scss @@ -1,17 +1,3 @@ -panel-plugin-dashlist .panel-container { - border-radius: 4px; - border:none; - box-shadow: $card-shadow; - .panel-header { - text-align: left !important; - font-size: 1.25rem; - padding: 0 20px 10px 20px; - .panel-title { - font-weight: 400; - } - } -} - .dashlist-item { } From 5407052e0cdac12acafaf94b5970f151954d1484 Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Fri, 25 Mar 2016 17:41:31 -0400 Subject: [PATCH 3/5] Tightened up the bottom padding on playlist headers - distance to bottom border --- public/sass/pages/_playlist.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/sass/pages/_playlist.scss b/public/sass/pages/_playlist.scss index 412fbcaef50..d0d8f04f130 100644 --- a/public/sass/pages/_playlist.scss +++ b/public/sass/pages/_playlist.scss @@ -118,7 +118,7 @@ .playlist-column-header { border-bottom: thin solid $gray-1; - padding-bottom: 10px; + padding-bottom: 3px; margin-bottom: 15px; } From 4ced5bbbc0808769053f796e5e55251239a9b75e Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Sat, 26 Mar 2016 20:15:36 -0700 Subject: [PATCH 4/5] Fixed some minor typos in docs --- docs/sources/plugins/developing_plugins.md | 2 +- docs/sources/plugins/installation.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sources/plugins/developing_plugins.md b/docs/sources/plugins/developing_plugins.md index def5b825df9..43a99956d55 100644 --- a/docs/sources/plugins/developing_plugins.md +++ b/docs/sources/plugins/developing_plugins.md @@ -42,6 +42,6 @@ This makes it possible to have both built and src content in the same plugin fol ## Boilerplate We currently have three different examples that you can fork/download to get started developing your grafana plugin. - - [simple-json-datasource](https://github.com/grafana/simple-json-datasource) (small datasource plugin for quering json data from backends) + - [simple-json-datasource](https://github.com/grafana/simple-json-datasource) (small datasource plugin for querying json data from backends) - [piechart-panel](https://github.com/grafana/piechart-panel) - [example-app](https://github.com/grafana/example-app) diff --git a/docs/sources/plugins/installation.md b/docs/sources/plugins/installation.md index 7a4ed1889f9..7c60ccca7d2 100644 --- a/docs/sources/plugins/installation.md +++ b/docs/sources/plugins/installation.md @@ -11,7 +11,7 @@ page_keywords: grafana, plugins, documentation The easiest way to install plugins is by using the CLI tool grafana-cli which is bundled with grafana. Before any modification take place after modifying plugins, grafana-server needs to be restarted. ### Grafana plugin directory -On Linux systems the grafana-cli will assume that the grafana plugin directory is "/var/lib/grafana/plugins". It's possible to override the directory which grafana-cli will operate on by specifing the --path flag. On Windows systems this parameter have to be specified for every call. +On Linux systems the grafana-cli will assume that the grafana plugin directory is "/var/lib/grafana/plugins". It's possible to override the directory which grafana-cli will operate on by specifying the --path flag. On Windows systems this parameter have to be specified for every call. ### Grafana-cli commands From 2cb3505dce2bbfadedafa14e7858187ab2650eb8 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Sun, 27 Mar 2016 17:20:33 -0700 Subject: [PATCH 5/5] Examples for listing CloudWatch resources in templates. --- docs/sources/datasources/cloudwatch.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/sources/datasources/cloudwatch.md b/docs/sources/datasources/cloudwatch.md index 351b08eb2aa..c69d3579784 100644 --- a/docs/sources/datasources/cloudwatch.md +++ b/docs/sources/datasources/cloudwatch.md @@ -69,8 +69,22 @@ Name | Description For details about the metrics CloudWatch provides, please refer to the [CloudWatch documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html). -The `ec2_instance_attribute` query take `filters` in JSON format. -You can specify [pre-defined filters of ec2:DescribeInstances](http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances.html). +## Example templated Queries + +Example dimension queries which will return list of resources for individual AWS Services: + +Service | Query +------- | ----- +EBS | `dimension_values(us-east-1,AWS/ELB,RequestCount,LoadBalancerName)` +ElastiCache | `dimension_values(us-east-1,AWS/ElastiCache,CPUUtilization,CacheClusterId)` +RedShift | `dimension_values(us-east-1,AWS/Redshift,CPUUtilization,ClusterIdentifier)` +RDS | `dimension_values(us-east-1,AWS/RDS,CPUUtilization,DBInstanceIdentifier)` +S3 | `dimension_values(us-east-1,AWS/S3,BucketSizeBytes,BucketName)` + +## ec2_instance_attribute JSON filters + +The `ec2_instance_attribute` query take `filters` in JSON format. +You can specify [pre-defined filters of ec2:DescribeInstances](http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances.html). Specify like `{ filter_name1: [ filter_value1 ], filter_name2: [ filter_value2 ] }` Example `ec2_instance_attribute()` query