Added username, site and password for influxdb datasources

pkg/stores/sqlstore/sqlstore_datasource.go

@@ -28,7 +28,7 @@ func GetDataSourceById(query *m.GetDataSourceByIdQuery) error {
 }
 
 func GetDataSources(query *m.GetDataSourcesQuery) error {
-	sess := x.Limit(100, 0).Where("account_id=?", query.AccountId)
+	sess := x.Limit(100, 0).Where("account_id=?", query.AccountId).Asc("name")
 
 	query.Result = make([]*m.DataSource, 0)
 	return sess.Find(&query.Result)
@@ -53,6 +53,9 @@ func AddDataSource(cmd *m.AddDataSourceCommand) error {
 			Type:      cmd.Type,
 			Access:    cmd.Access,
 			Url:       cmd.Url,
+			User:      cmd.User,
+			Password:  cmd.Password,
+			Database:  cmd.Database,
 			Created:   time.Now(),
 			Updated:   time.Now(),
 		}
@@ -75,6 +78,9 @@ func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error {
 			Type:      cmd.Type,
 			Access:    cmd.Access,
 			Url:       cmd.Url,
+			User:      cmd.User,
+			Password:  cmd.Password,
+			Database:  cmd.Database,
 			Updated:   time.Now(),
 		}
 

pkg/stores/sqlstore/sqlstore_test.go

@@ -34,9 +34,10 @@ func TestDataAccess(t *testing.T) {
 
 			err := AddDataSource(&m.AddDataSourceCommand{
 				AccountId: 10,
-				Type:      m.DS_GRAPHITE,
+				Type:      m.DS_INFLUXDB,
 				Access:    m.DS_ACCESS_DIRECT,
 				Url:       "http://test",
+				Database:  "site",
 			})
 
 			So(err, ShouldBeNil)
@@ -50,6 +51,7 @@ func TestDataAccess(t *testing.T) {
 			ds := query.Result[0]
 
 			So(ds.AccountId, ShouldEqual, 10)
+			So(ds.Database, ShouldEqual, "site")
 		})
 
 		Convey("Given a datasource", func() {