Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added time #247

Merged
merged 19 commits into from
Oct 6, 2023
Merged

added time #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f336adb
added time
Nithunikzz Sep 23, 2023
2ad76f0
fix
Nithunikzz Sep 23, 2023
53b9800
fix
Nithunikzz Sep 23, 2023
495d761
fix
Nithunikzz Sep 23, 2023
66ddff8
fix
Nithunikzz Sep 23, 2023
dccf98d
fix
Nithunikzz Sep 23, 2023
b6e92f8
fix
Nithunikzz Sep 23, 2023
3ccc8e7
fix
Nithunikzz Sep 24, 2023
c2ddbe1
fix
Nithunikzz Sep 24, 2023
7a22dc2
fix
Nithunikzz Sep 24, 2023
9606e74
fix
Nithunikzz Sep 24, 2023
3e5f2f9
fix
Nithunikzz Sep 26, 2023
a5ab558
fix
Nithunikzz Sep 26, 2023
91b3a6b
default values
Nithunikzz Sep 29, 2023
0a99d08
default values
Nithunikzz Sep 29, 2023
0ce9e60
default values
Nithunikzz Sep 29, 2023
d425be9
default values
Nithunikzz Sep 29, 2023
49b02ac
default values
Nithunikzz Sep 29, 2023
e784414
Fix
Nithunikzz Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions agent/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (
type AgentConfigurations struct {
SANamespace string `envconfig:"SA_NAMESPACE" default:"default"`
SAName string `envconfig:"SA_NAME" default:"default"`
OutdatedInterval string `envconfig:"OUTDATED_INTERVAL" default:"@every 20m"`
OutdatedInterval string `envconfig:"OUTDATED_INTERVAL" default:"0"`
GetAllInterval string `envconfig:"GETALL_INTERVAL" default:"*/30 * * * *"`
KubeScoreInterval string `envconfig:"KUBESCORE_INTERVAL" default:"*/40 * * * *"`
RakkessInterval string `envconfig:"RAKKESS_INTERVAL" default:"*/50 * * * *"`
KubePreUpgradeInterval string `envconfig:"KUBEPREUPGRADE_INTERVAL" default:"*/60 * * * *"`
TrivyInterval string `envconfig:"TRIVY_INTERVAL" default:"*/10 * * * *"`
SchedulerEnable bool `envconfig:"SCHEDULER_ENABLE" default:"false"`
SchedulerEnable bool `envconfig:"SCHEDULER_ENABLE" default:"true"`
}

func GetAgentConfigurations() (serviceConf *AgentConfigurations, err error) {
Expand Down
23 changes: 11 additions & 12 deletions agent/kubviz/k8smetrics_agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,19 @@ var (
)

func runTrivyScans(config *rest.Config, js nats.JetStreamContext) error {
err := RunTrivyK8sClusterScan(js)
err := RunTrivyImageScans(config, js)
if err != nil {
return err
}
err = RunTrivyImageScans(config, js)
err = RunTrivySbomScan(config, js)
if err != nil {
return err
}
err = RunTrivySbomScan(config, js)
err = RunTrivyK8sClusterScan(js)
if err != nil {
return err
}

return nil

}
Expand Down Expand Up @@ -134,9 +135,7 @@ func main() {
}

collectAndPublishMetrics()
if schedulingIntervalStr == "" {
schedulingIntervalStr = "20m"
}

if cfg.SchedulerEnable { // Assuming "cfg.Schedule" is a boolean indicating whether to schedule or not.
scheduler := initScheduler(config, js, *cfg, clientset)

Expand Down Expand Up @@ -301,7 +300,7 @@ func watchK8sEvents(clientset *kubernetes.Clientset, js nats.JetStreamContext) {
func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.AgentConfigurations, clientset *kubernetes.Clientset) (s *Scheduler) {
log := logging.NewLogger()
s = NewScheduler(log)
if cfg.OutdatedInterval != "" {
if cfg.OutdatedInterval != "" && cfg.OutdatedInterval != "0" {
sj, err := NewOutDatedImagesJob(config, js, cfg.OutdatedInterval)
if err != nil {
log.Fatal("no time interval", err)
Expand All @@ -311,7 +310,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
log.Fatal("failed to do job", err)
}
}
if cfg.GetAllInterval != "" {
if cfg.GetAllInterval != "" && cfg.GetAllInterval != "0" {
sj, err := NewKetallJob(config, js, cfg.GetAllInterval)
if err != nil {
log.Fatal("no time interval", err)
Expand All @@ -321,7 +320,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
log.Fatal("failed to do job", err)
}
}
if cfg.KubeScoreInterval != "" {
if cfg.KubeScoreInterval != "" && cfg.KubeScoreInterval != "0" {
sj, err := NewKubescoreJob(clientset, js, cfg.KubeScoreInterval)
if err != nil {
log.Fatal("no time interval", err)
Expand All @@ -331,7 +330,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
log.Fatal("failed to do job", err)
}
}
if cfg.RakkessInterval != "" {
if cfg.RakkessInterval != "" && cfg.RakkessInterval != "0" {
sj, err := NewRakkessJob(config, js, cfg.RakkessInterval)
if err != nil {
log.Fatal("no time interval", err)
Expand All @@ -341,7 +340,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
log.Fatal("failed to do job", err)
}
}
if cfg.KubePreUpgradeInterval != "" {
if cfg.KubePreUpgradeInterval != "" && cfg.KubePreUpgradeInterval != "0" {
sj, err := NewKubePreUpgradeJob(config, js, cfg.KubePreUpgradeInterval)
if err != nil {
log.Fatal("no time interval", err)
Expand All @@ -351,7 +350,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
log.Fatal("failed to do job", err)
}
}
if cfg.TrivyInterval != "" {
if cfg.TrivyInterval != "" && cfg.TrivyInterval != "0" {
sj, err := NewTrivyJob(config, js, cfg.TrivyInterval)
if err != nil {
log.Fatal("no time interval", err)
Expand Down
2 changes: 1 addition & 1 deletion agent/kubviz/scheduler_watch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (v *KubePreUpgradeJob) CronSpec() string {

func (j *KubePreUpgradeJob) Run() {
// Call the Kubepreupgrade function with the provided config and js
err := GetAllResources(j.config, j.js)
err := KubePreUpgradeDetector(j.config, j.js)
LogErr(err)
}

Expand Down
2 changes: 1 addition & 1 deletion agent/kubviz/trivy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func executeCommandTrivy(command string) ([]byte, error) {
}
func RunTrivyK8sClusterScan(js nats.JetStreamContext) error {
var report report.ConsolidatedReport
cmdString := "trivy k8s --report summary cluster --exclude-nodes kubernetes.io/arch:amd64 --timeout 20m -f json --cache-dir /tmp/.cache --debug"
cmdString := "trivy k8s --report summary cluster --exclude-nodes kubernetes.io/arch:amd64 --timeout 60m -f json --cache-dir /tmp/.cache --debug"

// Log the command before execution
log.Printf("Executing command: %s\n", cmdString)
Expand Down
Loading