IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-01 13:09:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into websocket

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-03-15 09:52:36 +01:00
commit b273cd1339
26 changed files with 312 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/plugins/frontend_plugin.go
View File

@ -24,14 +24,22 @@ func (fp *FrontendPluginBase) initFrontendPlugin() {
fp.handleModuleDefaults()
fp.Info.Logos.Small = evalRelativePluginUrlPath(fp.Info.Logos.Small, fp.BaseUrl)
fp.Info.Logos.Large = evalRelativePluginUrlPath(fp.Info.Logos.Large, fp.BaseUrl)
fp.Info.Logos.Small = getPluginLogoUrl(fp.Info.Logos.Small, fp.BaseUrl)
fp.Info.Logos.Large = getPluginLogoUrl(fp.Info.Logos.Large, fp.BaseUrl)
for i := 0; i < len(fp.Info.Screenshots); i++ {
fp.Info.Screenshots[i].Path = evalRelativePluginUrlPath(fp.Info.Screenshots[i].Path, fp.BaseUrl)
}
}
func getPluginLogoUrl(path, baseUrl string) string {
if path == "" {
return "public/img/plugin-default-logo_dark.svg"
}
return evalRelativePluginUrlPath(path, baseUrl)
}
func (fp *FrontendPluginBase) setPathsBasedOnApp(app *AppPlugin) {
appSubPath := strings.Replace(fp.PluginDir, app.StaticRootAbs, "", 1)
fp.IncludedInAppId = app.Id

55
public/app/features/plugins/partials/plugin_list.html
View File

@ -26,37 +26,26 @@
</div>
</div>
<table class="filter-table">
<thead>
<tr>
<th><strong>Name</strong></th>
<th><strong>Type</strong></th>
<th style="width: 60px;"></th>
<th style="width: 80px;"></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="plugin in ctrl.plugins">
<td>
<a href="plugins/{{plugin.id}}/edit">
{{plugin.name}}
</a>
</td>
<td>
{{plugin.type}}
</td>
<td>
<span class="label label-secondary" ng-if="plugin.enabled">Enabled</span>
<span class="label label-secondary" ng-if="plugin.pinned">Pinned</span>
</td>
<td class="text-right">
<a href="plugins/{{plugin.id}}/edit" class="btn btn-inverse btn-small">
<i class="fa fa-edit"></i>
Edit
</a>
</td>
</tr>
</tbody>
</table>
</div>
<section class="card-section">
<ol class="card-list">
<li class="card-item-wrapper" ng-repeat="plugin in ctrl.plugins">
<a class="card-item" href="plugins/{{plugin.id}}/edit">
<div class="card-item-header">
<i class="icon-gf icon-gf-{{plugin.type}}"></i>
{{plugin.type}}
</div>
<div class="card-item-body">
<figure class="card-item-figure">
<img src="{{plugin.info.logos.small}}">
</figure>
<div class="card-item-details">
<div class="card-item-name" href="plugins/{{plugin.id}}/edit">{{plugin.name}}</div>
<div class="card-item-sub-name">By {{plugin.info.author.name}}</div>
</div>
</div>
</a>
</li>
</ol>
</section>
</div>

BIN
public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.3 KiB

13
public/app/plugins/datasource/cloudwatch/plugin.json
View File

@ -4,5 +4,16 @@
"id": "cloudwatch",
"metrics": true,
"annotations": true
"annotations": true,
"info": {
"author": {
"name": "Grafana Project",
"url": "http://grafana.org"
},
"logos": {
"small": "img/amazon-web-services.png",
"large": "img/amazon-web-services.png"
}
}
}

2
public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
View File

@ -66,7 +66,7 @@
<input class="tight-form-input" type="number" ng-model="agg.settings.trimEdges" ng-change="onChangeInternal()">
</li>
<li class="tight-form-item last">
<i class="fa fa-question-circle" bs-tooltip="'Trim the edges on the timeserie x datapoints'" data-placement="right"></i>
<i class="fa fa-question-circle" bs-tooltip="'Trim the edges on the timeseries x datapoints'" data-placement="right"></i>
</li>
</ul>
<div class="clearfix"></div>

2
public/app/plugins/datasource/elasticsearch/plugin.json
View File

@ -6,7 +6,7 @@
"info": {
"description": "Elasticsearch Data Source for Grafana",
"author": {
"name": "Grafana Core",
"name": "Grafana Project",
"url": "http://grafana.org"
},
"keywords": ["elasticsearch"],

9
public/app/plugins/datasource/graphite/plugin.json
View File

@ -8,5 +8,12 @@
],
"metrics": true,
"annotations": true
"annotations": true,
"info": {
"author": {
"name": "Grafana Project",
"url": "http://grafana.org"
}
}
}

15
public/app/plugins/datasource/influxdb/img/influxdb_logo.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="256px" height="265px" viewBox="0 0 256 265" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
<g>
<path d="M82.472546,256.199228 C75.4995714,246.636291 77.6910777,233.487253 87.2540143,226.514279 C89.2462927,225.119684 91.4377991,224.123545 93.6293054,223.326633 L94.0277611,215.357519 C88.8478371,213.166013 84.6640523,207.587633 84.2655966,202.009254 L76.4957106,200.016975 C75.1011157,202.009254 73.5072929,203.603076 71.5150144,204.997671 C61.9520778,211.970646 48.6038121,209.77914 41.8300654,200.216203 C34.8570907,190.653266 37.0485971,177.504229 46.6115337,170.531254 C56.1744703,163.558279 69.3235081,165.749786 76.2964827,175.312722 C78.0895334,177.902684 79.4841283,180.891102 80.0818118,183.87952 L93.6293054,187.465621 C97.2154066,186.071026 101.199964,185.871798 104.786065,187.266393 L112.555951,181.688013 C110.563672,173.519672 113.751318,164.554419 120.724292,159.573722 C130.287229,152.600748 143.635495,154.792254 150.409242,164.355191 C157.382216,173.7189 155.19071,187.067165 145.627773,194.04014 C138.654799,199.020836 129.29109,199.419292 122.118887,195.036279 L114.349001,200.614659 C114.548229,204.399988 113.153634,208.185317 110.7629,211.173735 L109.965989,225.119684 C112.755179,226.713507 115.145913,228.705785 116.938963,231.295747 C123.71271,240.858684 121.720432,254.007722 112.157495,260.980696 C102.793786,267.953671 89.4455206,265.762164 82.472546,256.199228 L82.472546,256.199228 Z" fill="#0690BA"></path>
<path d="M112.157495,234.68262 C109.965989,231.694203 106.977571,229.701924 103.789926,228.905013 L104.985293,208.583773 C108.172938,205.993811 109.368305,201.810026 107.97371,198.024697 L122.318115,187.664849 C127.498039,193.044001 136.064837,193.840912 142.2409,189.258672 C149.213874,184.277975 150.608469,174.715039 145.627773,167.742064 C140.647077,160.968317 131.08414,159.374495 124.111166,164.355191 C117.935103,168.937431 115.942824,177.305001 119.528925,183.87952 L104.985293,194.239368 C101.996875,191.649406 97.6138623,191.450178 94.0277611,193.641684 L74.3042043,188.46176 C74.5034321,185.074887 73.5072929,181.488786 71.5150144,178.699596 C66.5343183,171.925849 56.7721538,170.332026 49.9984071,175.312722 C43.0254324,180.293418 41.6308375,189.856355 46.6115337,196.82933 C51.5922298,203.802304 61.1551664,205.196899 68.1281411,200.216203 C70.7181031,198.223925 72.5111537,195.83319 73.5072929,193.044001 L90.8401155,197.626241 C89.4455206,200.415431 89.8439763,204.001532 91.8362547,206.591494 C93.8285332,209.380684 97.0161788,210.576051 100.203824,210.376823 L99.2076851,228.307329 C96.2192674,228.307329 93.2308497,229.303469 90.6408877,231.295747 C83.8671409,236.276443 82.2733181,245.83938 87.2540143,252.812354 C92.2347104,259.785329 101.797647,261.179924 108.770622,256.199228 C115.743596,251.218532 117.138191,241.655595 112.157495,234.68262 L112.157495,234.68262 Z M127.896495,169.734343 C131.881052,166.945153 137.260204,167.742064 140.049394,171.726621 C142.838583,175.711178 142.041672,181.09033 138.057115,183.87952 C134.86947,186.270254 130.486457,186.071026 127.498039,183.680292 L130.088001,181.688013 C131.881052,182.684153 134.471014,182.684153 136.264064,181.289558 C138.854026,179.496507 139.45171,175.910406 137.459432,173.320444 C135.666381,170.730482 132.08028,170.132798 129.490318,172.125077 C127.697267,173.519672 126.900356,175.711178 127.298811,177.902684 L124.708849,179.894963 C123.513482,176.308862 124.708849,172.125077 127.896495,169.734343 L127.896495,169.734343 Z M64.5420398,195.235507 C60.3582551,198.223925 54.5806475,197.227785 51.5922298,193.044001 C48.6038121,188.860216 49.5999514,183.082608 53.7837361,180.094191 C57.9675209,177.105773 63.7451284,178.101912 66.7335461,182.086469 C67.7296854,183.481064 68.3273689,185.074887 68.5265967,186.66871 L65.3389512,185.871798 C65.1397234,185.274115 64.9404955,184.477203 64.342812,183.87952 C62.3505335,181.09033 58.3659766,180.492646 55.5767867,182.484925 C52.7875969,184.477203 52.1899134,188.46176 54.1821918,191.25095 C56.1744703,194.04014 60.1590272,194.637823 62.9482171,192.645545 C63.7451284,192.047861 64.342812,191.25095 64.7412677,190.454039 L67.7296854,191.25095 C66.932774,192.844773 65.9366347,194.239368 64.5420398,195.235507 L64.5420398,195.235507 Z M92.2347104,249.226253 C89.2462927,245.042468 90.242432,239.264861 94.2269889,236.276443 C95.6215838,235.280304 97.2154066,234.68262 98.8092294,234.483393 L98.6100015,237.671038 C97.6138623,237.870266 96.8169509,238.069494 96.0200395,238.667177 C93.2308497,240.659456 92.6331661,244.644013 94.6254446,247.433203 C96.6177231,250.222392 100.60228,250.820076 103.39147,248.827798 C106.18066,246.835519 106.778343,242.850962 104.786065,240.061772 C104.387609,239.464089 103.789926,239.065633 103.192242,238.667177 L103.39147,235.280304 C104.786065,235.877988 106.18066,236.874127 107.176799,238.268722 C110.165217,242.452506 109.169077,248.230114 104.985293,251.218532 C101.000736,254.406177 95.2231281,253.410038 92.2347104,249.226253 L92.2347104,249.226253 Z" fill="#C3E8F2"></path>
<path d="M239.065633,223.924317 C227.908874,227.510418 215.955203,221.334355 212.369102,210.177595 C211.57219,207.786861 211.372962,205.595355 211.372962,203.204621 L203.802304,200.415431 C200.216203,204.798444 193.442456,206.790722 188.063304,205.396127 L183.680292,212.169874 C185.074887,213.962924 186.270254,216.154431 186.867937,218.545165 C190.454039,229.701924 184.277975,241.655595 173.121216,245.440924 C161.964457,249.027025 150.010786,242.850962 146.424685,231.694203 C142.838583,220.537443 149.014647,208.583773 160.171406,204.997671 C163.159824,204.001532 166.347469,203.802304 169.535115,204.20076 L177.105773,192.446317 C176.906545,188.660988 177.902684,184.875659 180.492646,181.887241 L177.504229,172.72276 C169.136659,172.125077 161.765229,166.148241 158.976039,158.179128 C155.389938,147.022368 161.566001,135.068697 172.72276,131.482596 C183.87952,127.896495 195.83319,134.072558 199.419292,145.229318 C202.009254,153.397659 199.419292,162.362912 193.044001,167.941292 L196.032418,177.105773 C199.817747,178.101912 203.005393,180.492646 204.997671,183.87952 L214.560608,188.46176 C216.951342,186.270254 223.127405,185.074887 226.115823,184.078748 C237.272582,180.492646 249.226253,186.66871 253.011582,197.825469 C256.398456,208.384545 250.222392,220.338216 239.065633,223.924317 L239.065633,223.924317 Z" fill="#0690BA"></path>
<path d="M227.709646,189.059444 C224.322772,190.254811 221.334355,192.446317 219.541304,195.235507 L200.415431,187.864077 C199.020836,184.078748 195.235507,181.688013 191.25095,181.887241 L185.871798,165.152102 C192.645545,161.765229 196.032418,153.995343 193.641684,146.623912 C191.051722,138.455571 182.285697,134.072558 174.316583,136.66252 C166.347469,139.252482 161.765229,148.018507 164.355191,155.987621 C166.745925,163.359052 174.117355,167.742064 181.488786,166.347469 L186.867937,183.281836 C183.481064,185.473342 181.887241,189.457899 183.082608,193.442456 L171.925849,210.576051 C168.738203,209.380684 165.152102,209.181456 161.765229,210.177595 C153.596887,212.767557 149.213874,221.533583 151.803836,229.502696 C154.393798,237.671038 163.159824,242.054051 171.128938,239.464089 C179.297279,236.874127 183.680292,228.108102 181.09033,220.138988 C180.094191,217.15057 178.30114,214.560608 175.910406,212.767557 L185.67257,197.626241 C188.063304,199.817747 191.450178,200.614659 194.637823,199.61852 C197.825469,198.62238 200.016975,196.032418 200.813887,192.844773 L217.549026,199.419292 C216.752114,202.208482 216.752114,205.396127 217.748254,208.384545 C220.338216,216.552886 229.104241,220.935899 237.073355,218.345937 C245.241696,215.755975 249.624709,206.98995 247.034747,199.020836 C244.444785,190.852494 235.877988,186.469482 227.709646,189.059444 L227.709646,189.059444 Z M170.92971,153.995343 C169.535115,149.413102 171.925849,144.432406 176.508089,143.037811 C181.09033,141.443988 186.071026,144.03395 187.465621,148.616191 C188.660988,152.40152 187.067165,156.585305 183.87952,158.577583 L182.88338,155.589166 C184.477203,154.194571 185.274115,151.803836 184.477203,149.61233 C183.481064,146.623912 180.293418,145.03009 177.305001,146.026229 C174.316583,147.022368 172.72276,150.210014 173.7189,153.198431 C174.515811,155.389938 176.308862,156.784533 178.500368,157.182988 L179.496507,160.370634 C175.711178,160.171406 172.125077,157.780672 170.92971,153.995343 L170.92971,153.995343 Z M175.51195,222.131266 C177.105773,227.111962 174.316583,232.291886 169.535115,233.885709 C164.554419,235.479532 159.374495,232.690342 157.780672,227.908874 C156.186849,223.127405 158.976039,217.748254 163.757507,216.154431 C165.35133,215.556747 167.144381,215.556747 168.738203,215.955203 L166.945153,218.744393 C166.347469,218.744393 165.550558,218.744393 164.753646,218.943621 C161.566001,219.93976 159.77295,223.525861 160.76909,226.912734 C161.765229,230.10038 165.35133,231.893431 168.738203,230.897291 C171.925849,229.901152 173.7189,226.315051 172.72276,223.127405 C172.324305,222.131266 171.925849,221.334355 171.128938,220.736671 L172.921988,218.146709 C173.918127,219.142848 174.914267,220.537443 175.51195,222.131266 L175.51195,222.131266 Z M235.280304,212.56833 C230.299608,214.162152 225.119684,211.372962 223.525861,206.591494 C222.928178,204.997671 222.928178,203.204621 223.326633,201.610798 L226.315051,202.806165 C226.115823,203.802304 226.115823,204.798444 226.514279,205.595355 C227.510418,208.982228 231.096519,210.576051 234.483393,209.579912 C237.870266,208.583773 239.663317,204.997671 238.46795,201.610798 C237.47181,198.423152 233.885709,196.630102 230.498836,197.626241 C229.901152,197.825469 229.104241,198.223925 228.705785,198.62238 L225.51814,197.427013 C226.514279,196.231646 227.908874,195.235507 229.701924,194.637823 C234.68262,193.044001 239.862544,195.83319 241.456367,200.614659 C242.850962,205.794583 240.261,210.974507 235.280304,212.56833 L235.280304,212.56833 Z" fill="#C3E8F2"></path>
<path d="M255.203089,66.7335461 C255.203089,78.4879891 245.640152,88.0509257 233.885709,88.0509257 C231.494975,88.0509257 229.104241,87.65247 223.326633,86.4571029 L218.345937,92.6331661 C224.721228,97.8130901 224.721228,104.786065 221.73281,109.567533 L226.713507,115.743596 C228.905013,114.946685 231.295747,114.548229 233.686481,114.548229 C245.440924,114.548229 255.003861,124.111166 255.003861,135.865609 C255.003861,147.620052 245.440924,157.182988 233.686481,157.182988 C221.932038,157.182988 212.369102,147.620052 212.369102,135.865609 C212.369102,132.677963 213.166013,129.490318 214.36138,126.701128 L205.595355,115.942824 C201.810026,114.946685 198.62238,112.755179 196.430874,109.567533 L186.867937,109.567533 C184.078748,117.337419 176.308862,122.517343 167.742064,122.517343 C155.987621,122.517343 146.424685,112.954406 146.424685,101.199964 C146.424685,89.4455206 155.987621,79.882584 167.742064,80.0818118 C176.308862,80.0818118 184.078748,85.4609637 187.266393,93.2308497 L196.82933,93.2308497 C199.020836,90.0432041 202.208482,87.65247 205.993811,86.8555586 L214.759836,76.0972549 C213.365241,73.3080651 212.767557,70.1204195 212.767557,66.932774 C212.767557,55.1783311 222.330494,45.6153944 234.084937,45.6153944 C245.83938,45.6153944 255.203089,55.1783311 255.203089,66.7335461 L255.203089,66.7335461 Z" fill="#0690BA"></path>
<path d="M218.545165,66.7335461 C218.545165,70.3196474 219.740532,73.7065207 221.932038,76.2964827 L208.982228,92.0354826 C204.997671,92.2347104 201.41157,95.0239003 200.415431,98.8092294 L182.684153,98.8092294 C181.488786,91.4377991 175.113494,85.6601915 167.542836,85.6601915 C158.976039,85.6601915 152.202292,92.4339383 152.202292,101.000736 C152.202292,109.368305 158.976039,116.34128 167.542836,116.34128 C175.312722,116.34128 181.688013,110.563672 182.88338,103.192242 L200.614659,103.192242 C201.610798,106.977571 204.997671,109.766761 209.181456,109.965989 L222.131266,125.704989 C219.93976,128.294951 218.744393,131.681824 218.744393,135.267925 C218.744393,143.834723 225.717367,150.608469 234.084937,150.608469 C242.651734,150.608469 249.425481,143.635495 249.425481,135.267925 C249.425481,126.701128 242.651734,119.927381 234.084937,119.927381 C230.897291,119.927381 227.908874,120.92352 225.51814,122.517343 L214.162152,108.571394 C216.951342,106.977571 218.744393,103.989153 218.744393,100.801508 C218.744393,97.4146344 216.951342,94.4262168 214.162152,92.832394 L225.51814,78.8864447 C227.908874,80.4802675 230.897291,81.4764067 234.084937,81.4764067 C242.651734,81.4764067 249.425481,74.5034321 249.425481,66.1358626 C249.425481,57.5690652 242.452506,50.7953184 234.084937,50.7953184 C225.51814,51.393002 218.545165,58.3659766 218.545165,66.7335461 L218.545165,66.7335461 Z M167.742064,109.965989 C162.960596,109.965989 158.976039,105.981432 158.976039,101.199964 C158.976039,96.4184952 162.960596,92.4339383 167.742064,92.4339383 C171.726621,92.4339383 175.113494,95.2231281 176.109634,98.8092294 L172.921988,98.8092294 C172.125077,96.8169509 170.132798,95.422356 167.742064,95.422356 C164.554419,95.422356 162.163684,98.012318 162.163684,101.000736 C162.163684,104.188381 164.753646,106.778343 167.742064,106.778343 C170.132798,106.778343 172.125077,105.383748 172.921988,103.39147 L176.109634,103.39147 C175.113494,107.376027 171.726621,109.965989 167.742064,109.965989 L167.742064,109.965989 Z M233.885709,126.701128 C239.065633,126.701128 243.249418,130.884913 243.249418,136.064837 C243.249418,141.244761 239.065633,145.428545 233.885709,145.428545 C228.705785,145.428545 224.522,141.244761 224.522,136.064837 C224.522,134.271786 225.119684,132.677963 225.916595,131.283368 L228.108102,133.87333 C227.908874,134.471014 227.709646,135.267925 227.709646,136.064837 C227.709646,139.45171 230.498836,142.2409 233.885709,142.2409 C237.272582,142.2409 240.061772,139.45171 240.061772,136.064837 C240.061772,132.677963 237.272582,129.888773 233.885709,129.888773 C232.88957,129.888773 231.893431,130.088001 231.096519,130.486457 L229.104241,128.095723 C230.498836,127.099584 232.291886,126.701128 233.885709,126.701128 L233.885709,126.701128 Z M243.249418,66.7335461 C243.249418,71.9134701 239.065633,76.0972549 233.885709,76.0972549 C232.092658,76.0972549 230.498836,75.6987992 229.104241,74.70266 L231.096519,72.3119258 C231.893431,72.7103815 232.88957,72.9096094 233.885709,73.1088372 C237.272582,73.1088372 240.061772,70.3196474 240.061772,66.932774 C240.061772,63.5459006 237.272582,60.7567107 233.885709,60.7567107 C230.498836,60.7567107 227.709646,63.5459006 227.709646,66.932774 C227.709646,67.7296854 227.908874,68.3273689 228.108102,68.9250524 L225.916595,71.5150144 C225.119684,70.1204195 224.522,68.5265967 224.522,66.7335461 C224.522,61.5536221 228.705785,57.3698374 233.885709,57.3698374 C239.065633,57.5690652 243.249418,61.5536221 243.249418,66.7335461 L243.249418,66.7335461 Z" fill="#C3E8F2"></path>
<path d="M110.7629,1.98449612 C121.91966,5.57059736 128.095723,17.723496 124.310394,28.8802554 C123.513482,31.2709895 122.517343,33.263268 120.92352,35.2555464 L125.306533,42.0292932 C130.884913,40.6346983 137.459432,42.8262046 141.045533,47.2092172 L148.616191,44.4200274 C148.616191,42.0292932 149.014647,39.6385591 149.61233,37.4470527 C153.198431,26.2902934 165.35133,20.1142301 176.508089,23.8995592 C187.664849,27.4856604 193.840912,39.4393312 190.055583,50.7953184 C186.469482,61.9520778 174.316583,68.1281411 163.159824,64.342812 C160.171406,63.3466727 157.382216,61.75285 155.19071,59.5613437 L142.2409,64.5420398 C140.248621,67.7296854 137.060976,70.3196474 133.275647,71.3157866 L130.287229,80.4802675 C136.66252,86.0586472 139.252482,95.0239003 136.66252,103.192242 C133.076419,114.349001 120.92352,120.525065 109.766761,116.739736 C98.8092294,112.555951 92.6331661,100.60228 96.2192674,89.4455206 C98.8092294,81.2771789 106.379888,75.4995714 114.747457,74.9018878 L117.735875,65.7374069 C115.345141,62.7489892 114.149774,58.9636601 114.548229,54.9791032 L106.977571,43.2246603 C103.789926,43.623116 100.60228,43.4238881 97.6138623,42.4277489 C86.4571029,38.8416477 80.2810397,26.8879769 83.8671409,15.7312175 C87.65247,4.57445812 99.6061408,-1.60160511 110.7629,1.98449612 L110.7629,1.98449612 Z" fill="#0690BA"></path>
<path d="M99.4069129,36.8493692 C102.793786,38.0447363 106.379888,37.8455084 109.567533,36.6501414 L120.525065,53.7837361 C119.329698,57.7682931 121.122748,61.75285 124.310394,63.9443563 L118.732014,80.6794954 C111.360584,79.4841283 103.989153,83.6679131 101.598419,91.0393434 C99.0084572,99.2076851 103.39147,107.774482 111.360584,110.563672 C119.329698,113.153634 128.095723,108.770622 130.884913,100.801508 C133.275647,93.4300775 129.888773,85.6601915 123.115027,82.2733181 L128.693406,65.5381791 C132.677963,65.7374069 136.463292,63.3466727 137.857887,59.5613437 L156.98376,52.1899134 C158.776811,54.9791032 161.566001,57.3698374 165.152102,58.3659766 C173.320444,60.9559386 181.887241,56.572926 184.676431,48.4045843 C187.266393,40.2362426 182.88338,31.6694452 174.715039,28.8802554 C166.546697,26.2902934 157.9799,30.673306 155.19071,38.6424198 C154.194571,41.6308375 154.194571,44.8184831 154.991482,47.6076729 L138.256343,54.1821918 C137.658659,51.1937741 135.467153,48.4045843 132.279508,47.4084451 C129.091862,46.4123058 125.704989,47.2092172 123.314254,49.2014957 L113.55209,34.0601794 C115.942824,32.2671287 117.735875,29.6771667 118.732014,26.6887491 C121.321976,18.5204074 116.938963,9.95360997 108.770622,7.36364797 C100.60228,4.77368597 92.0354826,9.15669859 89.4455206,17.3250403 C86.8555586,25.493382 91.2385712,34.2594072 99.4069129,36.8493692 L99.4069129,36.8493692 Z M124.708849,98.8092294 C123.115027,103.39147 118.333558,105.981432 113.751318,104.387609 C109.169077,102.793786 106.579115,98.012318 108.172938,93.4300775 C109.368305,89.6447484 113.153634,87.2540143 116.938963,87.4532421 L115.942824,90.4416598 C113.751318,90.6408877 111.958267,92.2347104 111.161356,94.2269889 C110.165217,97.2154066 111.759039,100.403052 114.747457,101.399191 C117.735875,102.395331 120.92352,100.801508 121.91966,97.8130901 C122.716571,95.6215838 121.91966,93.2308497 120.325837,91.8362547 L121.321976,88.6486092 C124.509622,90.8401155 126.103444,94.8246724 124.708849,98.8092294 L124.708849,98.8092294 Z M160.968317,40.8339261 C162.56214,35.85323 167.742064,33.263268 172.72276,34.8570907 C177.504229,36.4509135 180.293418,41.8300654 178.699596,46.6115337 C177.105773,51.393002 171.925849,54.1821918 166.945153,52.5883691 C165.35133,51.9906855 163.956735,50.9945463 162.960596,49.7991792 L166.148241,48.6038121 C166.745925,49.0022678 167.343608,49.4007235 168.14052,49.5999514 C171.328165,50.5960906 174.914267,48.80304 175.910406,45.6153944 C176.906545,42.4277489 175.113494,38.8416477 171.925849,37.8455084 C168.738203,36.8493692 165.152102,38.6424198 163.956735,41.8300654 C163.757507,42.8262046 163.558279,43.8223438 163.757507,44.6192552 L160.76909,45.8146223 C160.569862,44.2207995 160.569862,42.4277489 160.968317,40.8339261 L160.968317,40.8339261 Z M106.977571,13.3404834 C111.958267,14.9343061 114.548229,20.1142301 112.954406,25.0949263 C112.356723,26.6887491 111.559812,28.083344 110.165217,29.2787111 L108.571394,26.6887491 C109.169077,26.0910655 109.766761,25.2941541 110.165217,24.2980149 C111.161356,20.9111415 109.368305,17.5242681 106.18066,16.328901 C102.993014,15.3327618 99.4069129,17.1258124 98.2115458,20.313458 C97.2154066,23.5011035 99.0084572,27.0872047 102.196103,28.083344 C102.793786,28.2825718 103.590698,28.4817997 104.188381,28.2825718 L105.981432,31.0717617 C104.387609,31.4702174 102.793786,31.4702174 101.000736,30.8725338 C96.0200395,29.2787111 93.4300775,24.098787 95.0239003,19.1180909 C96.8169509,14.5358504 102.196103,11.7466606 106.977571,13.3404834 L106.977571,13.3404834 Z" fill="#C3E8F2"></path>
<path d="M34.6578629,114.149774 C36.6501414,115.544368 38.2439641,117.337419 39.6385591,119.329698 L47.4084451,117.337419 C47.8069007,111.759039 51.9906855,105.981432 57.1706095,103.989153 L56.7721538,96.0200395 C54.5806475,95.422356 52.3891412,94.2269889 50.3968627,92.832394 C41.033154,85.6601915 38.8416477,72.3119258 45.8146223,62.7489892 C52.7875969,53.1860526 65.9366347,51.1937741 75.4995714,58.1667487 C84.8632801,65.1397234 87.0547864,78.2887612 80.0818118,87.8516978 C78.2887612,90.4416598 75.8980271,92.4339383 73.1088372,94.0277611 L73.9057486,107.97371 C76.2964827,110.962128 77.6910777,114.747457 77.4918498,118.532786 L85.2617358,124.111166 C92.4339383,119.728153 101.797647,120.126609 108.770622,125.107305 C118.333558,132.08028 120.325837,145.428545 113.352862,154.792254 C106.579115,164.355191 93.2308497,166.347469 83.6679131,159.573722 C76.6949384,154.593026 73.5072929,145.627773 75.4995714,137.459432 L67.7296854,131.881052 C64.1435841,133.275647 60.1590272,133.275647 56.572926,131.681824 L43.0254324,135.267925 C42.4277489,138.455571 41.2323818,141.443988 39.2401034,143.834723 C32.4663566,153.198431 19.3173187,155.389938 9.75438212,148.416963 C0.191445508,141.643216 -1.80083295,128.294951 4.97291382,118.732014 C11.9458884,109.169077 25.0949263,107.176799 34.6578629,114.149774 Z" fill="#0690BA"></path>
<path d="M34.6578629,140.447849 C36.8493692,137.459432 37.8455084,134.072558 37.6462806,130.685685 L57.3698374,125.505761 C60.7567107,127.697267 65.1397234,127.498039 68.3273689,124.908077 L82.6717738,135.267925 C79.2849004,141.842444 81.0779511,150.210014 87.2540143,154.792254 C94.2269889,159.77295 103.789926,158.378355 108.770622,151.405381 C113.751318,144.631634 112.356723,134.86947 105.383748,129.888773 C99.2076851,125.306533 90.6408877,126.103444 85.2617358,131.482596 L70.9173309,121.122748 C72.3119258,117.536647 71.3157866,113.153634 68.1281411,110.563672 L66.932774,90.242432 C70.3196474,89.4455206 73.3080651,87.4532421 75.3003435,84.4648244 C80.2810397,77.4918498 78.6872169,67.9289132 71.9134701,62.9482171 C65.1397234,57.9675209 55.3775589,59.3621158 50.3968627,66.3350904 C45.4161666,73.1088372 46.8107615,82.8710017 53.7837361,87.8516978 C56.3736981,89.6447484 59.3621158,90.6408877 62.3505335,90.8401155 L63.3466727,108.770622 C60.1590272,108.372166 56.9713817,109.766761 54.9791032,112.555951 C52.9868247,115.345141 52.7875969,118.732014 53.982964,121.521204 L36.6501414,126.103444 C35.6540021,123.314254 33.8609515,120.724292 31.2709895,118.931242 C24.2980149,113.950546 14.7350783,115.544368 9.75438212,122.318115 C4.77368597,129.091862 6.16828089,138.854026 13.1412555,143.834723 C20.1142301,148.815419 29.6771667,147.221596 34.6578629,140.447849 L34.6578629,140.447849 Z M101.399191,135.267925 C105.383748,138.057115 106.18066,143.635495 103.39147,147.420824 C100.60228,151.405381 95.0239003,152.202292 91.2385712,149.413102 C88.0509257,147.022368 86.8555586,142.838583 88.2501535,139.252482 L90.8401155,141.244761 C90.4416598,143.436267 91.2385712,145.627773 93.0316218,147.022368 C95.6215838,148.815419 99.2076851,148.217735 101.000736,145.827001 C102.793786,143.237039 102.395331,139.650938 99.8053686,137.857887 C98.012318,136.463292 95.422356,136.463292 93.6293054,137.459432 L90.6408877,135.467153 C93.8285332,133.076419 98.012318,132.877191 101.399191,135.267925 L101.399191,135.267925 Z M57.3698374,82.8710017 C53.1860526,79.882584 52.3891412,73.9057486 55.3775589,69.9211917 C58.3659766,65.7374069 64.342812,64.9404955 68.3273689,67.9289132 C72.5111537,70.9173309 73.5072929,76.8941663 70.3196474,80.8787232 C69.3235081,82.2733181 67.9289132,83.2694574 66.5343183,83.8671409 L66.3350904,80.4802675 C66.932774,80.0818118 67.5304575,79.6833561 67.9289132,79.0856726 C69.9211917,76.2964827 69.3235081,72.3119258 66.5343183,70.3196474 C63.7451284,68.3273689 59.7605715,68.9250524 57.7682931,71.7142423 C55.7760146,74.5034321 56.3736981,78.4879891 59.162888,80.4802675 C59.9597994,81.0779511 60.9559386,81.4764067 61.75285,81.4764067 L61.9520778,84.6640523 C60.5574829,84.4648244 58.9636601,83.8671409 57.3698374,82.8710017 L57.3698374,82.8710017 Z M14.7350783,125.904216 C17.723496,121.720432 23.7003314,120.724292 27.6848883,123.911938 C29.0794832,124.908077 30.0756224,126.302672 30.8725338,127.697267 L27.6848883,128.494178 C27.2864326,127.697267 26.6887491,126.900356 25.8918377,126.302672 C23.1026478,124.310394 19.1180909,124.908077 17.1258124,127.697267 C15.133534,130.486457 15.7312175,134.471014 18.5204074,136.463292 C21.3095972,138.455571 25.2941541,137.857887 27.2864326,135.068697 C27.6848883,134.471014 28.083344,133.87333 28.2825718,133.076419 L31.6694452,132.279508 C31.4702174,133.87333 31.0717617,135.467153 29.8763946,136.861748 C26.8879769,141.045533 21.1103694,141.842444 16.9265846,138.854026 C12.543572,135.865609 11.7466606,129.888773 14.7350783,125.904216 L14.7350783,125.904216 Z" fill="#C3E8F2"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

13
public/app/plugins/datasource/influxdb/plugin.json
View File

@ -5,5 +5,16 @@
"defaultMatchFormat": "regex values",
"metrics": true,
"annotations": true
"annotations": true,
"info": {
"author": {
"name": "Grafana Project",
"url": "http://grafana.org"
},
"logos": {
"small": "img/influxdb_logo.svg",
"large": "img/influxdb_logo.svg"
}
}
}

BIN
public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

13
public/app/plugins/datasource/opentsdb/plugin.json
View File

@ -5,5 +5,16 @@
"metrics": true,
"defaultMatchFormat": "pipe",
"annotations": true
"annotations": true,
"info": {
"author": {
"name": "Grafana Project",
"url": "http://grafana.org"
},
"logos": {
"small": "img/opentsdb_logo.png",
"large": "img/opentsdb_logo.png"
}
}
}

19
public/app/plugins/datasource/prometheus/img/prometheus_logo.svg Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="115.333px" height="114px" viewBox="0 0 115.333 114" enable-background="new 0 0 115.333 114" xml:space="preserve">
<g id="Layer_2">
</g>
<g>
<path fill="#FFFFFF" d="M56.667,0.667C25.372,0.667,0,26.036,0,57.332c0,31.295,25.372,56.666,56.667,56.666
s56.666-25.371,56.666-56.666C113.333,26.036,87.961,0.667,56.667,0.667z M56.667,106.722c-8.904,0-16.123-5.948-16.123-13.283
H72.79C72.79,100.773,65.571,106.722,56.667,106.722z M83.297,89.04H30.034v-9.658h53.264V89.04z M83.106,74.411h-52.92
c-0.176-0.203-0.356-0.403-0.526-0.609c-5.452-6.62-6.736-10.076-7.983-13.598c-0.021-0.116,6.611,1.355,11.314,2.413
c0,0,2.42,0.56,5.958,1.205c-3.397-3.982-5.414-9.044-5.414-14.218c0-11.359,8.712-21.285,5.569-29.308
c3.059,0.249,6.331,6.456,6.552,16.161c3.252-4.494,4.613-12.701,4.613-17.733c0-5.21,3.433-11.262,6.867-11.469
c-3.061,5.045,0.793,9.37,4.219,20.099c1.285,4.03,1.121,10.812,2.113,15.113C63.797,33.534,65.333,20.5,71,16
c-2.5,5.667,0.37,12.758,2.333,16.167c3.167,5.5,5.087,9.667,5.087,17.548c0,5.284-1.951,10.259-5.242,14.148
c3.742-0.702,6.326-1.335,6.326-1.335l12.152-2.371C91.657,60.156,89.891,67.418,83.106,74.411z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

13
public/app/plugins/datasource/prometheus/plugin.json
View File

@ -8,5 +8,16 @@
],
"metrics": true,
"annotations": true
"annotations": true,
"info": {
"author": {
"name": "Grafana Project",
"url": "http://grafana.org"
},
"logos": {
"small": "img/prometheus_logo.svg",
"large": "img/prometheus_logo.svg"
}
}
}

9
public/app/plugins/panel/dashlist/plugin.json
View File

@ -1,5 +1,12 @@
{
"type": "panel",
"name": "Dashboard list",
"id": "dashlist"
"id": "dashlist",
"info": {
"author": {
"name": "Grafana Project",
"url": "http://grafana.org"
}
}
}

9
public/app/plugins/panel/graph/plugin.json
View File

@ -1,5 +1,12 @@
{
"type": "panel",
"name": "Graph",
"id": "graph"
"id": "graph",
"info": {
"author": {
"name": "Grafana Project",
"url": "http://grafana.org"
}
}
}

9
public/app/plugins/panel/singlestat/plugin.json
View File

@ -1,5 +1,12 @@
{
"type": "panel",
"name": "Singlestat",
"id": "singlestat"
"id": "singlestat",
"info": {
"author": {
"name": "Grafana Project",
"url": "http://grafana.org"
}
}
}

9
public/app/plugins/panel/table/plugin.json
View File

@ -1,5 +1,12 @@
{
"type": "panel",
"name": "Table",
"id": "table"
"id": "table",
"info": {
"author": {
"name": "Grafana Project",
"url": "http://grafana.org"
}
}
}

9
public/app/plugins/panel/text/plugin.json
View File

@ -1,5 +1,12 @@
{
"type": "panel",
"name": "Text",
"id": "text"
"id": "text",
"info": {
"author": {
"name": "Grafana Project",
"url": "http://grafana.org"
}
}
}

26
public/img/plugin-default-logo_dark.svg Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="150px" height="150px" viewBox="0 0 150 150" style="enable-background:new 0 0 150 150;" xml:space="preserve">
<style type="text/css">
.st0{fill:#040707;}
</style>
<g>
<polygon class="st0" points="44,0 150,106 150,99.9 50.1,0 "/>
<polygon class="st0" points="0,10.6 139.4,150 140.8,150 0,9.2 "/>
<polygon class="st0" points="26.6,0 150,123.4 150,119.6 30.4,0 "/>
<polygon class="st0" points="0,30.4 119.6,150 123.4,150 0,26.6 "/>
<polygon class="st0" points="9.2,0 150,140.8 150,139.4 10.6,0 "/>
<polygon class="st0" points="0,109.5 40.5,150 53.7,150 0,96.3 "/>
<polygon class="st0" points="0,129.3 20.7,150 36.3,150 0,113.7 "/>
<polygon class="st0" points="0,89.8 60.2,150 71.1,150 0,78.9 "/>
<polygon class="st0" points="0,70 80,150 88.6,150 0,61.4 "/>
<polygon class="st0" points="0,50.2 99.8,150 106,150 0,44 "/>
<polygon class="st0" points="0,150 18.9,150 0,131.1 "/>
<polygon class="st0" points="150,0 131.1,0 150,18.9 "/>
<polygon class="st0" points="129.3,0 113.6,0 150,36.4 150,20.7 "/>
<polygon class="st0" points="78.8,0 150,71.2 150,60.3 89.7,0 "/>
<polygon class="st0" points="61.4,0 150,88.6 150,80.1 69.9,0 "/>
<polygon class="st0" points="96.2,0 150,53.8 150,40.5 109.5,0 "/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

24
public/img/plugin-default-logo_light.svg Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="150px" height="150px" viewBox="0 0 150 150" style="enable-background:new 0 0 150 150;" xml:space="preserve">
<style type="text/css">
.st0{fill:#666666;}
</style>
<polygon class="st0" points="44,0 150,106 150,99.9 50.1,0 "/>
<polygon class="st0" points="0,10.6 139.4,150 140.8,150 0,9.2 "/>
<polygon class="st0" points="26.6,0 150,123.4 150,119.6 30.4,0 "/>
<polygon class="st0" points="0,30.4 119.6,150 123.4,150 0,26.6 "/>
<polygon class="st0" points="9.2,0 150,140.8 150,139.4 10.6,0 "/>
<polygon class="st0" points="0,109.5 40.5,150 53.7,150 0,96.3 "/>
<polygon class="st0" points="0,129.3 20.7,150 36.3,150 0,113.7 "/>
<polygon class="st0" points="0,89.8 60.2,150 71.1,150 0,78.9 "/>
<polygon class="st0" points="0,70 80,150 88.6,150 0,61.4 "/>
<polygon class="st0" points="0,50.2 99.8,150 106,150 0,44 "/>
<polygon class="st0" points="0,150 18.9,150 0,131.1 "/>
<polygon class="st0" points="150,0 131.1,0 150,18.9 "/>
<polygon class="st0" points="129.3,0 113.6,0 150,36.4 150,20.7 "/>
<polygon class="st0" points="78.8,0 150,71.2 150,60.3 89.7,0 "/>
<polygon class="st0" points="61.4,0 150,88.6 150,80.1 69.9,0 "/>
<polygon class="st0" points="96.2,0 150,53.8 150,40.5 109.5,0 "/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

1
public/sass/_grafana.scss
View File

@ -30,6 +30,7 @@
@import "layout/page";
// COMPONENTS
@import "components/cards";
@import "components/buttons";
@import "components/navs";
@import "components/tabs";

13
public/sass/_variables.dark.scss
View File

@ -67,9 +67,9 @@ $link-hover-color: $white;
// Typography
// -------------------------
$headings-color: darken($white,11%);
$abbr-border-color: $gray-3 !default;
$text-muted: darken($link-color,30%);
$headings-color: darken($white,11%);
$abbr-border-color: $gray-3 !default;
$text-muted: darken($link-color,30%);
$blockquote-small-color: $gray-3 !default;
$blockquote-border-color: $gray-4 !default;
@ -252,3 +252,10 @@ $popover-help-color: $text-color;
// images
$checkboxImageUrl: '../img/checkbox.png';
// cards
$card-background: linear-gradient(135deg, #2f2f2f, #262626);
$card-background-hover: linear-gradient(135deg, #343434, #262626);
$card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, .1), 1px 1px 0 0 rgba(0, 0, 0, .3);

6
public/sass/_variables.light.scss
View File

@ -279,3 +279,9 @@ $popover-help-color: $gray-6;
// images
$checkboxImageUrl: '../img/checkbox_white.png';
// cards
$card-background: linear-gradient(135deg, $gray-5, $gray-6);
$card-background-hover: linear-gradient(135deg, $gray-6, $gray-7);
$card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, .1), 1px 1px 0 0 rgba(0, 0, 0, .1);

2
public/sass/_variables.scss
View File

@ -4,7 +4,7 @@
//
// Quickly modify global styling by enabling or disabling optional features.
$enable-flex: false !default;
$enable-flex: true !default;
$enable-rounded: true !default;
$enable-shadows: false !default;
$enable-gradients: false !default;

7
public/sass/base/_fonts.scss
View File

@ -176,3 +176,10 @@
content: "\e903";
}
.icon-gf-app:before {
content: "\e902";
}
.icon-gf-datasource:before {
content: "\e607";
}

73
public/sass/components/_cards.scss Normal file
View File

@ -0,0 +1,73 @@
.card-section {
margin-bottom: $spacer*2;
}
.card-list {
display: flex;
flex-direction: row;
flex-wrap: wrap;
list-style-type: none;
}
.card-item-wrapper {
width: 100%;
padding: 0 1.5rem 1.5rem 0rem;
}
.card-item {
display: block;
height: 100%;
min-height: 12rem;
background: $card-background;
box-shadow: $card-shadow;
padding: 1rem;
border-radius: 4px;
&:hover {
background: $card-background-hover;
}
}
.card-item-figure {
margin: 0 $spacer $spacer 0;
img {
width: 6rem;
}
}
.card-item-body {
display: flex;
}
.card-item-details {
}
.card-item-header {
color: $text-color-weak;
margin-bottom: $spacer;
}
.card-item-name {
color: $headings-color;
font-size: $font-size-h3;
}
.card-item-sub-name {
color: $text-color-weak;
}
@include media-breakpoint-up(md) {
.card-item-wrapper {
width: 50%;
}
}
@include media-breakpoint-up(lg) {
.card-item-wrapper {
width: 33%;
}
}