Hi,
This seems to be due to an API change in the go-xorm library. Luckily,
the change is simple enough, and the attached patch fixes it.
Sadly, then other problems show with javascript, and I am not sure about
this...
## Build CSS: http://lesscss.org/usage/index.html
mkdir -p public/css
cd public/css \
&& lessc --include-path=../less
--include-path=../vendor/bootstrap/less ../less/bootstrap.dark.less
grafana.dark.min.css.tmp \
&& cat grafana.dark.min.css.tmp
/usr/share/fonts-font-awesome/css/font-awesome.css > grafana.dark.min.css \
&& lessc --include-path=../less
--include-path=../vendor/bootstrap/less ../less/bootstrap.light.less
grafana.light.min.css.tmp \
&& cat grafana.light.min.css.tmp
/usr/share/fonts-font-awesome/css/font-awesome.css > grafana.light.min.css \
;
tsc --module amd public/app/features/dashboard/timepicker/timepicker.ts
public/app/features/panel/panel_meta.ts public/app/core/core_module.ts
public/app/core/directives/give_focus.ts
public/app/core/directives/array_join.ts
public/app/core/filters/filters.ts public/app/core/core.ts
public/app/core/table_model.ts public/app/core/time_series.ts
public/app/core/controllers/signup_ctrl.ts
public/app/core/routes/bundle_loader.ts public/app/core/utils/flatten.ts
public/app/core/utils/datemath.ts public/app/core/utils/rangeutil.ts
public/app/headers/lodash/lodash.d.ts
public/app/headers/angularjs/angularjs.d.ts
public/app/headers/common.d.ts public/app/headers/moment/moment.d.ts
public/app/headers/moment/moment-node.d.ts
public/app/headers/require/require.d.ts
public/app/headers/jquery/jquery.d.ts
public/app/plugins/datasource/influxdb_08/specs/query_builder_specs.ts
public/app/plugins/datasource/influxdb_08/specs/datasource-specs.ts
public/app/plugins/datasource/influxdb_08/specs/influx_series_specs.ts
public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
public/app/plugins/datasource/graphite/specs/gfunc_specs.ts
public/app/plugins/datasource/graphite/specs/datasource_specs.ts
public/app/plugins/datasource/prometheus/specs/datasource_specs.ts
public/app/plugins/datasource/elasticsearch/specs/query_ctrl_specs.ts
public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
public/app/plugins/datasource/elasticsearch/specs/index_pattern_specs.ts
public/app/plugins/datasource/elasticsearch/specs/elastic_response_specs.ts
public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
public/app/plugins/datasource/elasticsearch/specs/query_def_specs.ts
public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts
public/app/plugins/datasource/influxdb/specs/query_builder_specs.ts
public/app/plugins/datasource/influxdb/specs/influx_query_specs.ts
public/app/plugins/datasource/influxdb/specs/query_part_specs.ts
public/app/plugins/datasource/influxdb/specs/influx_series_specs.ts
public/app/plugins/datasource/influxdb/query_part.ts
public/app/plugins/datasource/influxdb/influx_query.ts
public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
public/app/panels/table/transformers.ts
public/app/panels/table/module.ts
public/app/panels/table/specs/table_model_specs.ts
public/app/panels/table/specs/renderer_specs.ts
public/app/panels/table/specs/transformers_specs.ts
public/app/panels/table/editor.ts public/app/panels/table/controller.ts
public/app/panels/table/renderer.ts
public/test/core/table_model_specs.ts
public/test/core/utils/rangeutil_specs.ts
public/test/core/utils/datemath_specs.ts
public/test/core/utils/flatten_specs.ts public/test/lib/common.ts
public/app/headers/angularjs/angularjs.d.ts(1422,15): error TS2430:
Interface 'IHttpPromise<T>' incorrectly extends interface
'IPromise<IHttpPromiseCallbackArg<T>>'.
Types of property 'then' are incompatible.
Type '<TResult>(successCallback: (response:
IHttpPromiseCallbackArg<T>) => TResult | IPromise<TResult>,...' is not
assignable to type '<TResult>(successCallback: (promiseValue:
IHttpPromiseCallbackArg<T>) => IPromise<void> | TResult...'.
Types of parameters 'successCallback' and 'successCallback' are
incompatible.
Type 'IPromise<void> | TResult | IHttpPromise<TResult> |
IPromise<TResult>' is not assignable to type 'void | TResult |
IHttpPromiseCallbackArg<TResult> | IPromise<void | TResult |
IHttpPromiseCallbac...'.
Type 'IHttpPromise<TResult>' is not assignable to type 'void |
TResult | IHttpPromiseCallbackArg<TResult> | IPromise<void | TResult |
IHttpPromiseCallbac...'.
Type 'IHttpPromise<TResult>' is not assignable to type
'IPromise<void | TResult | IHttpPromiseCallbackArg<TResult>>'.
Types of property 'then' are incompatible.
Type '<TResult>(successCallback: (response:
IHttpPromiseCallbackArg<TResult>) => TResult | IPromise<TRe...' is not
assignable to type '<TResult>(successCallback: (promiseValue: void |
TResult | IHttpPromiseCallbackArg<TResult>) => I...'.
Types of parameters 'successCallback' and
'successCallback' are incompatible.
Type 'IPromise<void> | TResult |
IHttpPromise<TResult> | IPromise<TResult>' is not assignable to type
'void | TResult | IHttpPromiseCallbackArg<TResult> | IPromise<void |
TResult | IHttpPromiseCallbac...'.
Type 'IHttpPromise<TResult>' is not assignable to
type 'void | TResult | IHttpPromiseCallbackArg<TResult> | IPromise<void
| TResult | IHttpPromiseCallbac...'.
Type 'IHttpPromise<TResult>' is not assignable
to type 'IPromise<void | TResult | IHttpPromiseCallbackArg<TResult>>'.
Types of property 'then' are incompatible.
Type '<TResult>(successCallback: (response:
IHttpPromiseCallbackArg<TResult>) => TResult | IPromise<TRe...' is not
assignable to type '<TResult>(successCallback: (promiseValue: void |
TResult | IHttpPromiseCallbackArg<TResult>) => I...'.
Types of parameters 'successCallback' and
'successCallback' are incompatible.
Type 'IPromise<void> | TResult |
IHttpPromise<TResult> | IPromise<TResult>' is not assignable to type
'void | TResult | IHttpPromiseCallbackArg<TResult> | IPromise<void |
TResult | IHttpPromiseCallbac...'.
Type 'IHttpPromise<TResult>' is not
assignable to type 'void | TResult | IHttpPromiseCallbackArg<TResult> |
IPromise<void | TResult | IHttpPromiseCallbac...'.
Type 'IHttpPromise<TResult>' is not
assignable to type 'IPromise<void | TResult |
IHttpPromiseCallbackArg<TResult>>'.
Types of property 'then' are
incompatible.
Type '<TResult>(successCallback:
(response: IHttpPromiseCallbackArg<TResult>) => TResult |
IPromise<TRe...' is not assignable to type '<TResult>(successCallback:
(promiseValue: void | TResult | IHttpPromiseCallbackArg<TResult>) => I...'.
Type 'IPromise<void | TResult
| IHttpPromiseCallbackArg<TResult>>' is not assignable to type
'IPromise<TResult>'.
Type 'void | TResult |
IHttpPromiseCallbackArg<TResult>' is not assignable to type 'TResult'.
Type 'void' is not
assignable to type 'TResult'.
debian/rules:43: recipe for target 'build-indep' failed
--
Martín Ferrari (Tincho)
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -15,6 +15,7 @@
"github.com/grafana/grafana/pkg/setting"
_ "github.com/go-sql-driver/mysql"
+ "github.com/go-xorm/core"
"github.com/go-xorm/xorm"
_ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3"
@@ -93,15 +94,13 @@
if err != nil {
return fmt.Errorf("sqlstore.init(fail to create xorm.log): %v", err)
}
- x.Logger = xorm.NewSimpleLogger(f)
+ logger := xorm.NewSimpleLogger(f)
if setting.Env == setting.DEV {
- x.ShowSQL = false
- x.ShowInfo = false
- x.ShowDebug = false
- x.ShowErr = true
- x.ShowWarn = true
+ x.ShowSQL(false)
+ logger.SetLevel(core.LOG_WARNING)
}
+ x.SetLogger(logger)
}
return nil
