Merge pull request #8538 from yackushevas/master

misspell: Corrected some misspelled words

pkg/metrics/meter.go

@@ -124,7 +124,7 @@ func (m *StandardMeter) Count() int64 {
 	return count
 	return count
 }
 }
 
 
-// Mark records the occurance of n events.
+// Mark records the occurrence of n events.
 func (m *StandardMeter) Mark(n int64) {
 func (m *StandardMeter) Mark(n int64) {
 	m.lock.Lock()
 	m.lock.Lock()
 	defer m.lock.Unlock()
 	defer m.lock.Unlock()

pkg/services/alerting/extractor.go

@@ -89,7 +89,7 @@ func (e *DashAlertExtractor) GetAlerts() ([]*m.Alert, error) {
 				continue
 				continue
 			}
 			}
 
 
-			// backward compatability check, can be removed later
+			// backward compatibility check, can be removed later
 			enabled, hasEnabled := jsonAlert.CheckGet("enabled")
 			enabled, hasEnabled := jsonAlert.CheckGet("enabled")
 			if hasEnabled && enabled.MustBool() == false {
 			if hasEnabled && enabled.MustBool() == false {
 				continue
 				continue

pkg/services/alerting/notifiers/sensu.go

@@ -26,7 +26,7 @@ func init() {
       </div>
       </div>
       <div class="gf-form">
       <div class="gf-form">
         <span class="gf-form-label width-10">Source</span>
         <span class="gf-form-label width-10">Source</span>
-        <input type="text" class="gf-form-input max-width-14" ng-model="ctrl.model.settings.source" bs-tooltip="'If emtpy rule id will be used'" data-placement="right"></input>
+        <input type="text" class="gf-form-input max-width-14" ng-model="ctrl.model.settings.source" bs-tooltip="'If empty rule id will be used'" data-placement="right"></input>
       </div>
       </div>
       <div class="gf-form">
       <div class="gf-form">
         <span class="gf-form-label width-10">Handler</span>
         <span class="gf-form-label width-10">Handler</span>

pkg/services/sqlstore/sqlstore.go

@@ -199,7 +199,7 @@ func LoadConfig() {
 
 
 	if DbCfg.Type == "sqlite3" {
 	if DbCfg.Type == "sqlite3" {
 		UseSQLite3 = true
 		UseSQLite3 = true
-		// only allow one connection as sqlite3 has multi threading issues that casue table locks
+		// only allow one connection as sqlite3 has multi threading issues that cause table locks
 		// DbCfg.MaxIdleConn = 1
 		// DbCfg.MaxIdleConn = 1
 		// DbCfg.MaxOpenConn = 1
 		// DbCfg.MaxOpenConn = 1
 	}
 	}

pkg/setting/setting.go

@@ -306,7 +306,7 @@ func evalEnvVarExpression(value string) string {
 		envVar = strings.TrimSuffix(envVar, "}")
 		envVar = strings.TrimSuffix(envVar, "}")
 		envValue := os.Getenv(envVar)
 		envValue := os.Getenv(envVar)
 
 
-		// if env variable is hostname and it is emtpy use os.Hostname as default
+		// if env variable is hostname and it is empty use os.Hostname as default
 		if envVar == "HOSTNAME" && envValue == "" {
 		if envVar == "HOSTNAME" && envValue == "" {
 			envValue, _ = os.Hostname()
 			envValue, _ = os.Hostname()
 		}
 		}
@@ -635,14 +635,14 @@ func LogConfigurationInfo() {
 
 
 	if len(appliedCommandLineProperties) > 0 {
 	if len(appliedCommandLineProperties) > 0 {
 		for _, prop := range appliedCommandLineProperties {
 		for _, prop := range appliedCommandLineProperties {
-			logger.Info("Config overriden from command line", "arg", prop)
+			logger.Info("Config overridden from command line", "arg", prop)
 		}
 		}
 	}
 	}
 
 
 	if len(appliedEnvOverrides) > 0 {
 	if len(appliedEnvOverrides) > 0 {
 		text.WriteString("\tEnvironment variables used:\n")
 		text.WriteString("\tEnvironment variables used:\n")
 		for _, prop := range appliedEnvOverrides {
 		for _, prop := range appliedEnvOverrides {
-			logger.Info("Config overriden from Environment variable", "var", prop)
+			logger.Info("Config overridden from Environment variable", "var", prop)
 		}
 		}
 	}
 	}
 
 

pkg/setting/setting_test.go

@@ -73,7 +73,7 @@ func TestLoadingSettings(t *testing.T) {
 			So(Domain, ShouldEqual, "test2")
 			So(Domain, ShouldEqual, "test2")
 		})
 		})
 
 
-		Convey("Defaults can be overriden in specified config file", func() {
+		Convey("Defaults can be overridden in specified config file", func() {
 			NewConfigContext(&CommandLineArgs{
 			NewConfigContext(&CommandLineArgs{
 				HomePath: "../../",
 				HomePath: "../../",
 				Config:   filepath.Join(HomePath, "tests/config-files/override.ini"),
 				Config:   filepath.Join(HomePath, "tests/config-files/override.ini"),
@@ -103,7 +103,7 @@ func TestLoadingSettings(t *testing.T) {
 			So(DataPath, ShouldEqual, "/tmp/env_override")
 			So(DataPath, ShouldEqual, "/tmp/env_override")
 		})
 		})
 
 
-		Convey("instance_name default to hostname even if hostname env is emtpy", func() {
+		Convey("instance_name default to hostname even if hostname env is empty", func() {
 			NewConfigContext(&CommandLineArgs{
 			NewConfigContext(&CommandLineArgs{
 				HomePath: "../../",
 				HomePath: "../../",
 			})
 			})