Add Previous Option for Kubernetes Logs Queries (#61)

Author: ricoberger

pkg/kubernetes/client.go

@@ -43,7 +43,7 @@ type Client interface {
 	GetNamespaces(ctx context.Context) (*data.Frame, error)
 	GetResources(ctx context.Context, user string, groups []string, resourceId, namespace, parameterName, parameterValue string, wide bool) (*data.Frame, error)
 	GetContainers(ctx context.Context, user string, groups []string, resourceId, namespace, name string) (*data.Frame, error)
-	GetLogs(ctx context.Context, user string, groups []string, resourceId, namespace, name, container, filter string, tail int64, timeRange backend.TimeRange) (*data.Frame, error)
+	GetLogs(ctx context.Context, user string, groups []string, resourceId, namespace, name, container, filter string, tail int64, previous bool, timeRange backend.TimeRange) (*data.Frame, error)
 	GetResource(ctx context.Context, resourceId string) (*Resource, error)
 	Proxy(user string, groups []string, requestUrl string, w http.ResponseWriter, r *http.Request)
 }
@@ -395,7 +395,7 @@ func (c *client) getPodsAndContainers(ctx context.Context, user string, groups [
 // The timeRange parameter is used to filter the log lines based on their
 // timestamp. Only log lines that are within the time range are included in the
 // data frame.
-func (c *client) GetLogs(ctx context.Context, user string, groups []string, resourceId, namespace, name, container, filter string, tail int64, timeRange backend.TimeRange) (*data.Frame, error) {
+func (c *client) GetLogs(ctx context.Context, user string, groups []string, resourceId, namespace, name, container, filter string, tail int64, previous bool, timeRange backend.TimeRange) (*data.Frame, error) {
 	ctx, span := tracing.DefaultTracer().Start(ctx, "GetLogs")
 	defer span.End()
 	span.SetAttributes(attribute.Key("user").String(user))
@@ -405,6 +405,8 @@ func (c *client) GetLogs(ctx context.Context, user string, groups []string, reso
 	span.SetAttributes(attribute.Key("name").String(name))
 	span.SetAttributes(attribute.Key("container").String(container))
 	span.SetAttributes(attribute.Key("filter").String(filter))
+	span.SetAttributes(attribute.Key("tail").Int64(tail))
+	span.SetAttributes(attribute.Key("previous").Bool(previous))
 
 	// Get the pods for the requested resource.
 	pods, _, err := c.getPodsAndContainers(ctx, user, groups, resourceId, namespace, name)
@@ -427,6 +429,7 @@ func (c *client) GetLogs(ctx context.Context, user string, groups []string, reso
 
 			options := &corev1.PodLogOptions{
 				Container:  container,
+				Previous:   previous,
 				Timestamps: true,
 				SinceTime:  &metav1.Time{Time: timeRange.From},
 			}

pkg/kubernetes/client_mock.go

@@ -169,7 +169,7 @@ func TestGetLogs(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Run("should return logs", func(t *testing.T) {
-		actualLogs, err := client.GetLogs(context.Background(), "", nil, "pod", "default", "echoserver", "echoserver", "", 0, backend.TimeRange{From: time.Now().Add(-1 * time.Hour), To: time.Now().Add(1 * time.Hour)})
+		actualLogs, err := client.GetLogs(context.Background(), "", nil, "pod", "default", "echoserver", "echoserver", "", 0, false, backend.TimeRange{From: time.Now().Add(-1 * time.Hour), To: time.Now().Add(1 * time.Hour)})
 		require.NoError(t, err)
 		require.Equal(t, "timestamp", actualLogs.Fields[0].Name)
 		require.Equal(t, "body", actualLogs.Fields[1].Name)
@@ -187,7 +187,7 @@ func TestGetLogs(t *testing.T) {
 	})
 
 	t.Run("should return filtered logs", func(t *testing.T) {
-		actualLogs, err := client.GetLogs(context.Background(), "", nil, "pod", "default", "echoserver", "echoserver", "build", 0, backend.TimeRange{From: time.Now().Add(-1 * time.Hour), To: time.Now().Add(1 * time.Hour)})
+		actualLogs, err := client.GetLogs(context.Background(), "", nil, "pod", "default", "echoserver", "echoserver", "build", 0, false, backend.TimeRange{From: time.Now().Add(-1 * time.Hour), To: time.Now().Add(1 * time.Hour)})
 		require.NoError(t, err)
 		require.Equal(t, "timestamp", actualLogs.Fields[0].Name)
 		require.Equal(t, "body", actualLogs.Fields[1].Name)

pkg/kubernetes/client_test.go

@@ -34,6 +34,7 @@ type QueryModelKubernetesLogs struct {
 	Container  string `json:"container"`
 	Filter     string `json:"filter"`
 	Tail       int64  `json:"tail"`
+	Previous   bool   `json:"previous"`
 }
 
 type QueryModelHelmReleases struct {

pkg/models/query.go

@@ -233,7 +233,7 @@ func (d *Datasource) handleKubernetesLogs(ctx context.Context, query concurrent.
 		return backend.ErrorResponseWithErrorSource(err)
 	}
 
-	d.logger.Info("handleKubernetesLogs query", "user", user, "groups", groups, "resourceId", qm.ResourceId, "namespace", qm.Namespace, "name", qm.Name, "container", qm.Container, "filter", qm.Filter, "tail", qm.Tail)
+	d.logger.Info("handleKubernetesLogs query", "user", user, "groups", groups, "resourceId", qm.ResourceId, "namespace", qm.Namespace, "name", qm.Name, "container", qm.Container, "filter", qm.Filter, "tail", qm.Tail, "previous", qm.Previous)
 	span.SetAttributes(attribute.Key("user").String(user))
 	span.SetAttributes(attribute.Key("groups").StringSlice(groups))
 	span.SetAttributes(attribute.Key("resourceId").String(qm.ResourceId))
@@ -242,8 +242,9 @@ func (d *Datasource) handleKubernetesLogs(ctx context.Context, query concurrent.
 	span.SetAttributes(attribute.Key("container").String(qm.Container))
 	span.SetAttributes(attribute.Key("filter").String(qm.Filter))
 	span.SetAttributes(attribute.Key("tail").Int64(qm.Tail))
+	span.SetAttributes(attribute.Key("previous").Bool(qm.Previous))
 
-	frame, err := d.kubeClient.GetLogs(ctx, user, groups, qm.ResourceId, qm.Namespace, qm.Name, qm.Container, qm.Filter, qm.Tail, query.DataQuery.TimeRange)
+	frame, err := d.kubeClient.GetLogs(ctx, user, groups, qm.ResourceId, qm.Namespace, qm.Name, qm.Container, qm.Filter, qm.Tail, qm.Previous, query.DataQuery.TimeRange)
 	if err != nil {
 		d.logger.Error("Failed to get logs", "error", err.Error())
 		span.RecordError(err)

pkg/plugin/kubernetes.go

@@ -4,6 +4,7 @@ import {
   ComboboxOption,
   InlineField,
   InlineFieldRow,
+  InlineSwitch,
   Input,
 } from '@grafana/ui';
 import { QueryEditorProps } from '@grafana/data';
@@ -87,6 +88,14 @@ export function KubernetesLogs({
             value={query.tail || 0}
           />
         </InlineField>
+        <InlineField label="Previous">
+          <InlineSwitch
+            value={query.previous || false}
+            onChange={(event: ChangeEvent<HTMLInputElement>) => {
+              onChange({ ...query, previous: event.target.checked });
+            }}
+          />
+        </InlineField>
         <InlineField label="Filter" grow={true}>
           <Input
             id="query-editor-filter"

src/datasource/components/queryeditor/KubernetesLogs.tsx

@@ -45,6 +45,7 @@ export const DEFAULT_QUERIES: Record<QueryType, Partial<Query>> = {
     container: '',
     filter: '',
     tail: 0,
+    previous: false,
   },
   'helm-releases': {
     namespace: 'default',
@@ -118,6 +119,7 @@ export interface QueryModelKubernetesLogs {
   container?: string;
   filter?: string;
   tail?: number;
+  previous?: boolean;
 }
 
 export interface QueryModelHelmReleases {