sync with main

config/config.go

@@ -215,16 +215,6 @@ type AgentConfig struct {
 	// not be less than 2 times MetricBatchSize.
 	MetricBufferLimit int
 
-	// FlushBufferWhenFull tells Telegraf to flush the metric buffer whenever
-	// it fills up, regardless of FlushInterval. Setting this option to true
-	// does _not_ deactivate FlushInterval.
-	FlushBufferWhenFull bool `toml:"flush_buffer_when_full" deprecated:"0.13.0;1.35.0;option is ignored"`
-
-	// TODO(cam): Remove UTC and parameter, they are no longer
-	// valid for the agent config. Leaving them here for now for backwards-
-	// compatibility
-	UTC bool `toml:"utc" deprecated:"1.0.0;1.35.0;option is ignored"`
-
 	// Debug is the option for running in debug mode
 	Debug bool `toml:"debug"`
 

plugins/common/mqtt/mqtt.go

@@ -35,7 +35,7 @@ type MqttConfig struct {
 	KeepAlive           int64              `toml:"keep_alive"`
 	PersistentSession   bool               `toml:"persistent_session"`
 	PublishPropertiesV5 *PublishProperties `toml:"v5"`
-	ClientTrace         bool               `toml:"client_trace"`
+	ClientTrace         bool               `toml:"client_trace" deprecated:"1.37.0;1.45.0;use 'log_level' 'trace' instead"`
 
 	tls.ClientConfig
 

plugins/inputs/gnmi/gnmi.go

@@ -83,7 +83,6 @@ type subscription struct {
 	SampleInterval    config.Duration `toml:"sample_interval"`
 	SuppressRedundant bool            `toml:"suppress_redundant"`
 	HeartbeatInterval config.Duration `toml:"heartbeat_interval"`
-	TagOnly           bool            `toml:"tag_only" deprecated:"1.25.0;1.35.0;please use 'tag_subscription's instead"`
 
 	fullPath *gnmi.Path
 }
@@ -143,17 +142,6 @@ func (c *GNMI) Init() error {
 			return fmt.Errorf("empty 'path' found for subscription %d", i+1)
 		}
 
-		// Support and convert legacy TagOnly subscriptions
-		if subscription.TagOnly {
-			tagSub := tagSubscription{
-				subscription: subscription,
-				Match:        "name",
-			}
-			c.TagSubscriptions = append(c.TagSubscriptions, tagSub)
-			// Remove from the original subscriptions list
-			c.Subscriptions = append(c.Subscriptions[:i], c.Subscriptions[i+1:]...)
-			continue
-		}
 		if err := subscription.buildFullPath(c); err != nil {
 			return err
 		}
@@ -162,9 +150,6 @@ func (c *GNMI) Init() error {
 		if err := c.TagSubscriptions[idx].buildFullPath(c); err != nil {
 			return err
 		}
-		if c.TagSubscriptions[idx].TagOnly != c.TagSubscriptions[0].TagOnly {
-			return errors.New("do not mix legacy tag_only subscriptions and tag subscriptions")
-		}
 		switch c.TagSubscriptions[idx].Match {
 		case "":
 			if len(c.TagSubscriptions[idx].Elements) > 0 {

plugins/inputs/gnmi/gnmi_test.go

@@ -382,125 +382,6 @@ func TestNotification(t *testing.T) {
 				),
 			},
 		},
-		{
-			name: "legacy tagged update pair",
-			plugin: &GNMI{
-				Log:      testutil.Logger{},
-				Encoding: "proto",
-				Redial:   config.Duration(1 * time.Second),
-				Subscriptions: []subscription{
-					{
-						Name:             "oc-intf-desc",
-						Origin:           "openconfig-interfaces",
-						Path:             "/interfaces/interface/state/description",
-						SubscriptionMode: "on_change",
-						TagOnly:          true,
-					},
-					{
-						Name:             "oc-intf-counters",
-						Origin:           "openconfig-interfaces",
-						Path:             "/interfaces/interface/state/counters",
-						SubscriptionMode: "sample",
-					},
-				},
-			},
-			server: &mockServer{
-				subscribeF: func(server gnmi.GNMI_SubscribeServer) error {
-					tagResponse := &gnmi.SubscribeResponse{
-						Response: &gnmi.SubscribeResponse_Update{
-							Update: &gnmi.Notification{
-								Timestamp: 1543236571000000000,
-								Prefix:    &gnmi.Path{},
-								Update: []*gnmi.Update{
-									{
-										Path: &gnmi.Path{
-											Origin: "",
-											Elem: []*gnmi.PathElem{
-												{
-													Name: "interfaces",
-												},
-												{
-													Name: "interface",
-													Key:  map[string]string{"name": "Ethernet1"},
-												},
-												{
-													Name: "state",
-												},
-												{
-													Name: "description",
-												},
-											},
-											Target: "",
-										},
-										Val: &gnmi.TypedValue{
-											Value: &gnmi.TypedValue_StringVal{StringVal: "foo"},
-										},
-									},
-								},
-							},
-						},
-					}
-					if err := server.Send(tagResponse); err != nil {
-						return err
-					}
-					if err := server.Send(&gnmi.SubscribeResponse{Response: &gnmi.SubscribeResponse_SyncResponse{SyncResponse: true}}); err != nil {
-						return err
-					}
-					taggedResponse := &gnmi.SubscribeResponse{
-						Response: &gnmi.SubscribeResponse_Update{
-							Update: &gnmi.Notification{
-								Timestamp: 1543236572000000000,
-								Prefix:    &gnmi.Path{},
-								Update: []*gnmi.Update{
-									{
-										Path: &gnmi.Path{
-											Origin: "",
-											Elem: []*gnmi.PathElem{
-												{
-													Name: "interfaces",
-												},
-												{
-													Name: "interface",
-													Key:  map[string]string{"name": "Ethernet1"},
-												},
-												{
-													Name: "state",
-												},
-												{
-													Name: "counters",
-												},
-												{
-													Name: "in-broadcast-pkts",
-												},
-											},
-											Target: "",
-										},
-										Val: &gnmi.TypedValue{
-											Value: &gnmi.TypedValue_IntVal{IntVal: 42},
-										},
-									},
-								},
-							},
-						},
-					}
-					return server.Send(taggedResponse)
-				},
-			},
-			expected: []telegraf.Metric{
-				testutil.MustMetric(
-					"oc-intf-counters",
-					map[string]string{
-						"source":                   "127.0.0.1",
-						"name":                     "Ethernet1",
-						"oc-intf-desc/description": "foo",
-					},
-					map[string]interface{}{
-						"in_broadcast_pkts": 42,
-					},
-					time.Unix(0, 0),
-				),
-			},
-		},
 		{
 			name: "issue #11011",
 			plugin: &GNMI{

plugins/inputs/mongodb/README.md

@@ -59,9 +59,28 @@ See the [CONFIGURATION.md][CONFIGURATION.md] for more details.
   # col_stats_dbs = ["local"]
 
   ## Optional TLS Config
-  # tls_ca = "/etc/telegraf/ca.pem"
-  # tls_cert = "/etc/telegraf/cert.pem"
-  # tls_key = "/etc/telegraf/key.pem"
+  ## Set to true/false to enforce TLS being enabled/disabled. If not set,
+  ## enable TLS only if any of the other options are specified.
+  # tls_enable =
+  ## Trusted root certificates for server
+  # tls_ca = "/path/to/cafile"
+  ## Used for TLS client certificate authentication
+  # tls_cert = "/path/to/certfile"
+  ## Used for TLS client certificate authentication
+  # tls_key = "/path/to/keyfile"
+  ## Password for the key file if it is encrypted
+  # tls_key_pwd = ""
+  ## Send the specified TLS server name via SNI
+  # tls_server_name = "kubernetes.example.com"
+  ## Minimal TLS version to accept by the client
+  # tls_min_version = "TLS12"
+  ## List of ciphers to accept, by default all secure ciphers will be accepted
+  ## See https://pkg.go.dev/crypto/tls#pkg-constants for supported values.
+  ## Use "all", "secure" and "insecure" to add all support ciphers, secure
+  ## suites or insecure suites respectively.
+  # tls_cipher_suites = ["secure"]
+  ## Renegotiation method, "never", "once" or "freely"
+  # tls_renegotiation_method = "never"
   ## Use TLS but skip chain & host verification
   # insecure_skip_verify = false