Commit 32c36d32 authored by Dmitry Smirnov's avatar Dmitry Smirnov

New upstream release [2.6.0] + full copyright

parent 85b63f47
grafana (2.5.0+dfsg-1) UNRELEASED; urgency=low
grafana (2.6.0+dfsg-1) UNRELEASED; urgency=low
* Initial release (Closes: #797702).
......
......@@ -3,36 +3,45 @@ Section: web
Priority: optional
Maintainer: Dmitry Smirnov <onlyjob@debian.org>
Uploaders: pkg-go <pkg-go-maintainers@lists.alioth.debian.org>
Build-Depends: debhelper (>= 9), dh-golang, dh-systemd,
golang-github-aws-aws-sdk-go-dev,
golang-toml-dev | golang-github-burntsushi-toml-dev,
golang-github-davecgh-go-spew-dev,
golang-github-go-ldap-ldap-dev,
golang-github-go-sql-driver-mysql-dev,
golang-github-go-xorm-xorm-dev,
golang-github-go-xorm-core-dev,
golang-github-gosimple-slug-dev,
golang-pq-dev | golang-github-lib-pq-dev,
golang-github-jtolds-gls-dev,
# golang-github-macaron-contrib-binding-dev,
# golang-github-macaron-contrib-session-dev,
golang-github-mattn-go-sqlite3-dev,
golang-github-rainycape-unidecode-dev,
#~ golang-github-smartystreets-goconvey-dev,
golang-github-streadway-amqp-dev,
# golang-github-unknwon-com-dev,
# golang-github-unknwon-macaron-dev,
golang-github-vaughan0-go-ini-dev,
golang-golang-x-net-dev,
golang-golang-x-oauth2-dev,
golang-gopkg-asn1-ber.v1-dev,
# golang-gopkg-ini.v1-dev,
node-typescript
Build-Depends: debhelper (>= 9), dh-golang, dh-systemd
,golang-github-aws-aws-sdk-go-dev (>= 1.0.0)
,golang-github-bradfitz-gomemcache-dev
,golang-toml-dev | golang-github-burntsushi-toml-dev
,golang-github-davecgh-go-spew-dev
,golang-github-go-ldap-ldap-dev
,golang-github-go-sql-driver-mysql-dev
,golang-github-go-xorm-xorm-dev
,golang-github-go-xorm-core-dev
,golang-github-go-ini-ini-dev
,golang-github-go-macaron-gzip-dev
,golang-github-go-macaron-binding-dev
,golang-github-go-macaron-session-dev
,golang-github-gosimple-slug-dev
,golang-github-jmespath-go-jmespath-dev
,golang-github-jtolds-gls-dev
,golang-github-klauspost-compress-dev
,golang-github-klauspost-cpuid-dev
,golang-github-klauspost-crc32-dev
,golang-pq-dev | golang-github-lib-pq-dev
,golang-github-mattn-go-sqlite3-dev
,golang-github-rainycape-unidecode-dev
,golang-github-smartystreets-goconvey-dev
,golang-github-streadway-amqp-dev
,golang-github-unknwon-com-dev
,golang-github-vaughan0-go-ini-dev
,golang-golang-x-net-dev
,golang-golang-x-oauth2-dev
,golang-gopkg-asn1-ber.v1-dev
,golang-gopkg-bufio.v1-dev
,golang-gopkg-ini.v1-dev
,golang-gopkg-macaron.v1-dev
,golang-gopkg-redis.v2-dev
,node-typescript
Build-Depends-Indep: node-less
Standards-Version: 3.9.6
Homepage: http://grafana.org
Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/grafana.git
Vcs-Git: git://anonscm.debian.org/collab-maint/grafana.git
Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/grafana.git
Vcs-Git: https://anonscm.debian.org/collab-maint/grafana.git
Package: grafana
Architecture: any
......@@ -49,10 +58,14 @@ Description: feature rich metrics dashboard and graph editor
Package: grafana-data
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
,fonts-font-awesome
,libjs-twitter-bootstrap
,phantomjs
,fonts-font-awesome
,libjs-angularjs
,libjs-jquery
## ,libjs-jquery-flot
,libjs-twitter-bootstrap
,phantomjs
Recommends: grafana
Built-Using: ${misc:Built-Using}
Description: feature rich metrics dashboard and graph editor
......
This diff is collapsed.
## debian/missing-sources
/usr/share/grafana//missing-sources/crypto.js /usr/share/grafana/public/vendor/crypto.min.js
/usr/share/grafana//missing-sources/modernizr.js /usr/share/grafana/public/vendor/modernizr-2.6.1.js
/usr/share/grafana/missing-sources/crypto.js /usr/share/grafana/public/vendor/crypto.min.js
/usr/share/grafana/missing-sources/modernizr.js /usr/share/grafana/public/vendor/modernizr-2.6.1.js
/usr/share/grafana/missing-sources/normalize.css /usr/share/grafana/public/vendor/css/normalize.min.css
/usr/bin/phantomjs /usr/share/grafana/vendor/phantomjs/phantomjs
## phantomjs
/usr/bin/phantomjs /usr/share/grafana/vendor/phantomjs/phantomjs
## fonts-font-awesome
/usr/share/fonts-font-awesome/css/font-awesome.min.css /usr/share/grafana/public/vendor/css/font-awesome.min.css
/usr/share/fonts-font-awesome/fonts/FontAwesome.otf /usr/share/grafana/public/fonts/FontAwesome.otf
/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.eot /usr/share/grafana/public/fonts/fontawesome-webfont.eot
/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.svg /usr/share/grafana/public/fonts/fontawesome-webfont.svg
/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.ttf /usr/share/grafana/public/fonts/fontawesome-webfont.ttf
/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff /usr/share/grafana/public/fonts/fontawesome-webfont.woff
## libjs-twitter-bootstrap
## libjs-angularjs (1.3.20 vs 1.4.3)
#/usr/share/javascript/angular.js/angular.js /usr/share/grafana/public/vendor/angular/angular.js
## libjs-twitter-bootstrap (2.0.2 vs 2.3.2)
#/usr/share/twitter-bootstrap/files/js/bootstrap-transition.js /usr/share/grafana/public/vendor/bootstrap/bootstrap.js
/usr/share/twitter-bootstrap/files/img/glyphicons-halflings-white.png /usr/share/grafana/public/img/glyphicons-halflings-white.png
/usr/share/twitter-bootstrap/files/img/glyphicons-halflings.png /usr/share/grafana/public/img/glyphicons-halflings.png
## libjs-jquery-flot (0.8.3/really-1.1 vs 1.1+grafana: "ack -i grafana") don't replace!
##/usr/share/javascript/jquery-flot /usr/share/grafana/public/vendor/flot
## libjs-jquery (1.11.3 vs 2.1.4)
/usr/share/javascript/jquery/jquery.js /usr/share/grafana/public/vendor/jquery/dist/jquery.js
#!/bin/sh
set -e
## Directory <=> symlink update
## remove symlinks and empty directories:
D="/usr/share/grafana"
if [ -d "$D" ]; then
find "$D" -xdev -type l -delete
find "$D" -xdev -type d -empty -delete
## -printf 'removed %p\n'
done
#DEBHELPER#
......@@ -10,10 +10,10 @@ User=grafana
Group=grafana
Type=simple
WorkingDirectory=/usr/share/grafana
ExecStart=/usr/sbin/grafana \
--config=${CONF_FILE} \
ExecStart=/usr/sbin/grafana \
--config=${CONF_FILE} \
cfg:default.paths.logs=${LOG_DIR} \
cfg:default.paths.data=${DATA_DIR} \
cfg:default.paths.data=${DATA_DIR}
LimitNOFILE=10000
TimeoutStopSec=20
UMask=0027
......
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS and IE text size adjust after device orientation change,
* without disabling user zoom.
*/
html {
font-family: sans-serif; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/**
* Remove default margin.
*/
body {
margin: 0;
}
/* HTML5 display definitions
========================================================================== */
/**
* Correct `block` display not defined for any HTML5 element in IE 8/9.
* Correct `block` display not defined for `details` or `summary` in IE 10/11
* and Firefox.
* Correct `block` display not defined for `main` in IE 11.
*/
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
main,
menu,
nav,
section,
summary {
display: block;
}
/**
* 1. Correct `inline-block` display not defined in IE 8/9.
* 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
*/
audio,
canvas,
progress,
video {
display: inline-block; /* 1 */
vertical-align: baseline; /* 2 */
}
/**
* Prevent modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices.
*/
audio:not([controls]) {
display: none;
height: 0;
}
/**
* Address `[hidden]` styling not present in IE 8/9/10.
* Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
*/
[hidden],
template {
display: none;
}
/* Links
========================================================================== */
/**
* Remove the gray background color from active links in IE 10.
*/
a {
background-color: transparent;
}
/**
* Improve readability of focused elements when they are also in an
* active/hover state.
*/
a:active,
a:hover {
outline: 0;
}
/* Text-level semantics
========================================================================== */
/**
* Address styling not present in IE 8/9/10/11, Safari, and Chrome.
*/
abbr[title] {
border-bottom: 1px dotted;
}
/**
* Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
*/
b,
strong {
font-weight: bold;
}
/**
* Address styling not present in Safari and Chrome.
*/
dfn {
font-style: italic;
}
/**
* Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari, and Chrome.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/**
* Address styling not present in IE 8/9.
*/
mark {
background: #ff0;
color: #000;
}
/**
* Address inconsistent and variable font size in all browsers.
*/
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sup {
top: -0.5em;
}
sub {
bottom: -0.25em;
}
/* Embedded content
========================================================================== */
/**
* Remove border when inside `a` element in IE 8/9/10.
*/
img {
border: 0;
}
/**
* Correct overflow not hidden in IE 9/10/11.
*/
svg:not(:root) {
overflow: hidden;
}
/* Grouping content
========================================================================== */
/**
* Address margin not present in IE 8/9 and Safari.
*/
figure {
margin: 1em 40px;
}
/**
* Address differences between Firefox and other browsers.
*/
hr {
box-sizing: content-box;
height: 0;
}
/**
* Contain overflow in all browsers.
*/
pre {
overflow: auto;
}
/**
* Address odd `em`-unit font size rendering in all browsers.
*/
code,
kbd,
pre,
samp {
font-family: monospace, monospace;
font-size: 1em;
}
/* Forms
========================================================================== */
/**
* Known limitation: by default, Chrome and Safari on OS X allow very limited
* styling of `select`, unless a `border` property is set.
*/
/**
* 1. Correct color not being inherited.
* Known issue: affects color of disabled elements.
* 2. Correct font properties not being inherited.
* 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
*/
button,
input,
optgroup,
select,
textarea {
color: inherit; /* 1 */
font: inherit; /* 2 */
margin: 0; /* 3 */
}
/**
* Address `overflow` set to `hidden` in IE 8/9/10/11.
*/
button {
overflow: visible;
}
/**
* Address inconsistent `text-transform` inheritance for `button` and `select`.
* All other form control elements do not inherit `text-transform` values.
* Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
* Correct `select` style inheritance in Firefox.
*/
button,
select {
text-transform: none;
}
/**
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
* and `video` controls.
* 2. Correct inability to style clickable `input` types in iOS.
* 3. Improve usability and consistency of cursor style between image-type
* `input` and others.
*/
button,
html input[type="button"], /* 1 */
input[type="reset"],
input[type="submit"] {
-webkit-appearance: button; /* 2 */
cursor: pointer; /* 3 */
}
/**
* Re-set default cursor for disabled elements.
*/
button[disabled],
html input[disabled] {
cursor: default;
}
/**
* Remove inner padding and border in Firefox 4+.
*/
button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
padding: 0;
}
/**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/
input {
line-height: normal;
}
/**
* It's recommended that you don't attempt to style these elements.
* Firefox's implementation doesn't respect box-sizing, padding, or width.
*
* 1. Address box sizing set to `content-box` in IE 8/9/10.
* 2. Remove excess padding in IE 8/9/10.
*/
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* Fix the cursor style for Chrome's increment/decrement buttons. For certain
* `font-size` values of the `input`, it causes the cursor style of the
* decrement button to change from `default` to `text`.
*/
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
* 1. Address `appearance` set to `searchfield` in Safari and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
*/
input[type="search"] {
-webkit-appearance: textfield; /* 1 */
box-sizing: content-box; /* 2 */
}
/**
* Remove inner padding and search cancel button in Safari and Chrome on OS X.
* Safari (but not Chrome) clips the cancel button when the search input has
* padding (and `textfield` appearance).
*/
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* Define consistent border, margin, and padding.
*/
fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
}
/**
* 1. Correct `color` not being inherited in IE 8/9/10/11.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
legend {
border: 0; /* 1 */
padding: 0; /* 2 */
}
/**
* Remove default vertical scrollbar in IE 8/9/10/11.
*/
textarea {
overflow: auto;
}
/**
* Don't inherit the `font-weight` (applied by a rule above).
* NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
*/
optgroup {
font-weight: bold;
}
/* Tables
========================================================================== */
/**
* Remove most spacing between table cells.
*/
table {
border-collapse: collapse;
border-spacing: 0;
}
td,
th {
padding: 0;
}
https://raw.githubusercontent.com/necolas/normalize.css/3.0.3/normalize.css
Last-Update: 2016-02-11
Forwarded: not-needed
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: update macaron namespace + corresponding build fixes.
--- a/pkg/cmd/web.go
+++ b/pkg/cmd/web.go
@@ -7,9 +7,9 @@
"fmt"
"net/http"
"path"
- "github.com/Unknwon/macaron"
+ "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/api"
"github.com/grafana/grafana/pkg/api/static"
"github.com/grafana/grafana/pkg/log"
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -1,8 +1,8 @@
package api
import (
- "github.com/Unknwon/macaron"
+ "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
"github.com/macaron-contrib/binding"
--- a/pkg/api/common.go
+++ b/pkg/api/common.go
@@ -3,9 +3,9 @@
import (
"encoding/json"
"net/http"
- "github.com/Unknwon/macaron"
+ "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/setting"
--- a/pkg/middleware/auth.go
+++ b/pkg/middleware/auth.go
@@ -3,9 +3,9 @@
import (
"net/url"
"strings"
- "github.com/Unknwon/macaron"
+ "gopkg.in/macaron.v1"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
)
--- a/pkg/middleware/logger.go
+++ b/pkg/middleware/logger.go
@@ -19,9 +19,9 @@
"fmt"
"net/http"
"time"
- "github.com/Unknwon/macaron"
+ "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/setting"
)
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -3,9 +3,9 @@
import (
"strconv"
"strings"
- "github.com/Unknwon/macaron"
+ "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/apikeygen"
"github.com/grafana/grafana/pkg/log"
--- a/pkg/middleware/quota.go
+++ b/pkg/middleware/quota.go
@@ -2,9 +2,9 @@
import (
"fmt"
- "github.com/Unknwon/macaron"
+ "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
--- a/pkg/middleware/session.go
+++ b/pkg/middleware/session.go
@@ -2,9 +2,9 @@
import (
"time"
- "github.com/Unknwon/macaron"
+ "gopkg.in/macaron.v1"
"github.com/macaron-contrib/session"
_ "github.com/macaron-contrib/session/mysql"
_ "github.com/macaron-contrib/session/postgres"
_ "github.com/macaron-contrib/session/redis"
--- a/pkg/middleware/util.go
+++ b/pkg/middleware/util.go
@@ -2,13 +2,14 @@
import (
"strings"
- "github.com/Unknwon/macaron"
+ "github.com/go-macaron/gzip"
+ "gopkg.in/macaron.v1"
)
func Gziper() macaron.Handler {
- macaronGziper := macaron.Gziper()
+ macaronGziper := gzip.Gziper()
return func(ctx *macaron.Context) {
requestPath := ctx.Req.URL.RequestURI()
// ignore datasource proxy requests
--- a/pkg/middleware/validate_host.go
+++ b/pkg/middleware/validate_host.go
@@ -2,9 +2,9 @@
import (
"strings"
- "github.com/Unknwon/macaron"
+ "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/setting"
)
func ValidateHostHeader(domain string) macaron.Handler {
--- a/pkg/api/static/static.go
+++ b/pkg/api/static/static.go
@@ -23,9 +23,9 @@
"path/filepath"
"strings"
"sync"
- "github.com/Unknwon/macaron"
+ "gopkg.in/macaron.v1"
)
var Root string
--- a/pkg/middleware/middleware_test.go
+++ b/pkg/middleware/middleware_test.go
@@ -6,9 +6,9 @@
"net/http/httptest"
"path/filepath"
"testing"
- "github.com/Unknwon/macaron"
+ "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
--- a/pkg/api/dataproxy.go
+++ b/pkg/api/dataproxy.go
@@ -101,7 +101,7 @@
} else {
proxyPath := c.Params("*")
proxy := NewReverseProxy(ds, proxyPath, targetUrl)
proxy.Transport = dataProxyTransport
- proxy.ServeHTTP(c.RW(), c.Req.Request)
+ proxy.ServeHTTP(c.Resp, c.Req.Request)
}