Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update Organization comments on resources 

Remove `omitempty` on Organization field

Signed-off-by: Michael de Sa <mjdesa@gmail.com>
pull/10616/head
Jared Scheib 2017-10-25 14:56:08 -04:00 committed by Michael de Sa
parent 4786964b54
commit cf530eddc6
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bolt/internal/internal.proto
View File

@ -13,7 +13,7 @@ message Source {
bool InsecureSkipVerify = 9; // InsecureSkipVerify accepts any certificate from the influx server
string MetaURL = 10; // MetaURL is the connection URL for the meta node.
string SharedSecret = 11; // SharedSecret signs the optional InfluxDB JWT Authorization
string Organization = 12; // Organization is the organization ID for a resource
string Organization = 12; // Organization is the organization ID that resource belongs to
}
message Dashboard {
@ -21,7 +21,7 @@ message Dashboard {
string Name = 2; // Name is the user-defined name of the dashboard
repeated DashboardCell cells = 3; // a representation of all visual data required for rendering the dashboard
repeated Template templates = 4; // Templates replace template variables within InfluxQL
string Organization = 5; // Organization is the organization ID for a resource
string Organization = 5; // Organization is the organization ID that resource belongs to
}
message DashboardCell {
@ -78,7 +78,7 @@ message Server {
string URL = 5; // URL is the path to the server
int64 SrcID = 6; // SrcID is the ID of the data source
bool Active = 7; // is this the currently active server for the source
string Organization = 8; // Organization is the organization ID for a resource
string Organization = 8; // Organization is the organization ID that resource belongs to
}
message Layout {
@ -87,7 +87,7 @@ message Layout {
string Measurement = 3; // Measurement is the descriptive name of the time series data.
repeated Cell Cells = 4; // Cells are the individual visualization elements.
bool Autoflow = 5; // Autoflow indicates whether the frontend should layout the cells automatically.
string Organization = 7; // Organization is the organization ID for a resource
string Organization = 7; // Organization is the organization ID that resource belongs to
}
message Cell {

8
chronograf.go
View File

@ -432,7 +432,7 @@ type Source struct {
InsecureSkipVerify bool `json:"insecureSkipVerify,omitempty"` // InsecureSkipVerify as true means any certificate presented by the source is accepted.
Default bool `json:"default"` // Default specifies the default source for the application
Telegraf string `json:"telegraf"` // Telegraf is the db telegraf is written to. By default it is "telegraf"
Organization string `json:"organization,omitempty"` // Organization is the organization ID associated with a resource
Organization string `json:"organization"` // Organization is the organization ID that resource belongs to
}
// SourcesStore stores connection information for a `TimeSeries`
@ -552,7 +552,7 @@ type Server struct {
Password string // Password is in CLEARTEXT
URL string // URL are the connections to the server
Active bool // Is this the active server for the source?
Organization string // Organization is the organization ID associated with a resource
Organization string // Organization is the organization ID that resource belongs to
}
// ServersStore stores connection information for a `Server`
@ -672,7 +672,7 @@ type Dashboard struct {
Cells []DashboardCell `json:"cells"`
Templates []Template `json:"templates"`
Name string `json:"name"`
Organization string `json:"organization"`
Organization string `json:"organization"` // Organization is the organization ID that resource belongs to
}
// Axis represents the visible extents of a visualization
@ -733,7 +733,7 @@ type Layout struct {
Measurement string `json:"measurement"`
Autoflow bool `json:"autoflow"`
Cells []Cell `json:"cells"`
Organization string `json:"organization"`
Organization string `json:"organization"` // Organization is the organization ID that resource belongs to
}
// LayoutsStore stores dashboards and associated Cells

2
server/kapacitors.go
View File

@ -17,7 +17,7 @@ type postKapacitorRequest struct {
Username string `json:"username,omitempty"` // Username for authentication to kapacitor
Password string `json:"password,omitempty"`
Active bool `json:"active"`
Organization string `json:"organization"`
Organization string `json:"organization"` // Organization is the organization ID that resource belongs to
}
func (p *postKapacitorRequest) Valid() error {