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

Align with Tumblebug v0.9.6 #115

Merged
merged 3 commits into from
Aug 21, 2024
Merged

Align with Tumblebug v0.9.6 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8c67b5
Set the maxsize of logfile to 1GB
yunkon-kim Aug 21, 2024
9ab9b7a
Align with the changes of Tumblebug v0.9.6
yunkon-kim Aug 21, 2024
e5cdca1
Tidy up similarity pkg and exmaple
yunkon-kim Aug 21, 2024
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
28 changes: 14 additions & 14 deletions api/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,23 +580,23 @@ const docTemplate = `{
"example": "no"
},
"label": {
"description": "Label is for describing the mcis in a keyword (any string can be used)",
"description": "Label is for describing the mci in a keyword (any string can be used)",
"type": "string",
"example": "DynamicVM"
},
"name": {
"type": "string",
"example": "mcis01"
"example": "mci01"
},
"systemLabel": {
"description": "SystemLabel is for describing the mcis in a keyword (any string can be used) for special System purpose",
"description": "SystemLabel is for describing the mci in a keyword (any string can be used) for special System purpose",
"type": "string",
"example": ""
},
"vm": {
"type": "array",
"items": {
"$ref": "#/definitions/mcis.TbVmDynamicReq"
"$ref": "#/definitions/mci.TbVmDynamicReq"
}
}
}
Expand All @@ -623,23 +623,23 @@ const docTemplate = `{
"example": "no"
},
"label": {
"description": "Label is for describing the mcis in a keyword (any string can be used)",
"description": "Label is for describing the mci in a keyword (any string can be used)",
"type": "string",
"example": "DynamicVM"
},
"name": {
"type": "string",
"example": "mcis01"
"example": "mci01"
},
"systemLabel": {
"description": "SystemLabel is for describing the mcis in a keyword (any string can be used) for special System purpose",
"description": "SystemLabel is for describing the mci in a keyword (any string can be used) for special System purpose",
"type": "string",
"example": ""
},
"vm": {
"type": "array",
"items": {
"$ref": "#/definitions/mcis.TbVmDynamicReq"
"$ref": "#/definitions/mci.TbVmDynamicReq"
}
}
}
Expand Down Expand Up @@ -708,23 +708,23 @@ const docTemplate = `{
"example": "no"
},
"label": {
"description": "Label is for describing the mcis in a keyword (any string can be used)",
"description": "Label is for describing the mci in a keyword (any string can be used)",
"type": "string",
"example": "DynamicVM"
},
"name": {
"type": "string",
"example": "mcis01"
"example": "mci01"
},
"systemLabel": {
"description": "SystemLabel is for describing the mcis in a keyword (any string can be used) for special System purpose",
"description": "SystemLabel is for describing the mci in a keyword (any string can be used) for special System purpose",
"type": "string",
"example": ""
},
"vm": {
"type": "array",
"items": {
"$ref": "#/definitions/mcis.TbVmDynamicReq"
"$ref": "#/definitions/mci.TbVmDynamicReq"
}
}
}
Expand Down Expand Up @@ -1129,7 +1129,7 @@ const docTemplate = `{
}
}
},
"mcis.TbVmDynamicReq": {
"mci.TbVmDynamicReq": {
"type": "object",
"required": [
"commonImage",
Expand Down Expand Up @@ -1176,7 +1176,7 @@ const docTemplate = `{
"example": "default, TYPE1, ..."
},
"subGroupSize": {
"description": "if subGroupSize is (not empty) \u0026\u0026 (\u003e 0), subGroup will be gernetad. VMs will be created accordingly.",
"description": "if subGroupSize is (not empty) \u0026\u0026 (\u003e 0), subGroup will be generated. VMs will be created accordingly.",
"type": "string",
"default": "1",
"example": "3"
Expand Down
28 changes: 14 additions & 14 deletions api/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,23 +573,23 @@
"example": "no"
},
"label": {
"description": "Label is for describing the mcis in a keyword (any string can be used)",
"description": "Label is for describing the mci in a keyword (any string can be used)",
"type": "string",
"example": "DynamicVM"
},
"name": {
"type": "string",
"example": "mcis01"
"example": "mci01"
},
"systemLabel": {
"description": "SystemLabel is for describing the mcis in a keyword (any string can be used) for special System purpose",
"description": "SystemLabel is for describing the mci in a keyword (any string can be used) for special System purpose",
"type": "string",
"example": ""
},
"vm": {
"type": "array",
"items": {
"$ref": "#/definitions/mcis.TbVmDynamicReq"
"$ref": "#/definitions/mci.TbVmDynamicReq"
}
}
}
Expand All @@ -616,23 +616,23 @@
"example": "no"
},
"label": {
"description": "Label is for describing the mcis in a keyword (any string can be used)",
"description": "Label is for describing the mci in a keyword (any string can be used)",
"type": "string",
"example": "DynamicVM"
},
"name": {
"type": "string",
"example": "mcis01"
"example": "mci01"
},
"systemLabel": {
"description": "SystemLabel is for describing the mcis in a keyword (any string can be used) for special System purpose",
"description": "SystemLabel is for describing the mci in a keyword (any string can be used) for special System purpose",
"type": "string",
"example": ""
},
"vm": {
"type": "array",
"items": {
"$ref": "#/definitions/mcis.TbVmDynamicReq"
"$ref": "#/definitions/mci.TbVmDynamicReq"
}
}
}
Expand Down Expand Up @@ -701,23 +701,23 @@
"example": "no"
},
"label": {
"description": "Label is for describing the mcis in a keyword (any string can be used)",
"description": "Label is for describing the mci in a keyword (any string can be used)",
"type": "string",
"example": "DynamicVM"
},
"name": {
"type": "string",
"example": "mcis01"
"example": "mci01"
},
"systemLabel": {
"description": "SystemLabel is for describing the mcis in a keyword (any string can be used) for special System purpose",
"description": "SystemLabel is for describing the mci in a keyword (any string can be used) for special System purpose",
"type": "string",
"example": ""
},
"vm": {
"type": "array",
"items": {
"$ref": "#/definitions/mcis.TbVmDynamicReq"
"$ref": "#/definitions/mci.TbVmDynamicReq"
}
}
}
Expand Down Expand Up @@ -1122,7 +1122,7 @@
}
}
},
"mcis.TbVmDynamicReq": {
"mci.TbVmDynamicReq": {
"type": "object",
"required": [
"commonImage",
Expand Down Expand Up @@ -1169,7 +1169,7 @@
"example": "default, TYPE1, ..."
},
"subGroupSize": {
"description": "if subGroupSize is (not empty) \u0026\u0026 (\u003e 0), subGroup will be gernetad. VMs will be created accordingly.",
"description": "if subGroupSize is (not empty) \u0026\u0026 (\u003e 0), subGroup will be generated. VMs will be created accordingly.",
"type": "string",
"default": "1",
"example": "3"
Expand Down
28 changes: 14 additions & 14 deletions api/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@ definitions:
example: "no"
type: string
label:
description: Label is for describing the mcis in a keyword (any string can
description: Label is for describing the mci in a keyword (any string can
be used)
example: DynamicVM
type: string
name:
example: mcis01
example: mci01
type: string
systemLabel:
description: SystemLabel is for describing the mcis in a keyword (any string
description: SystemLabel is for describing the mci in a keyword (any string
can be used) for special System purpose
example: ""
type: string
vm:
items:
$ref: '#/definitions/mcis.TbVmDynamicReq'
$ref: '#/definitions/mci.TbVmDynamicReq'
type: array
required:
- name
Expand All @@ -81,21 +81,21 @@ definitions:
example: "no"
type: string
label:
description: Label is for describing the mcis in a keyword (any string can
description: Label is for describing the mci in a keyword (any string can
be used)
example: DynamicVM
type: string
name:
example: mcis01
example: mci01
type: string
systemLabel:
description: SystemLabel is for describing the mcis in a keyword (any string
description: SystemLabel is for describing the mci in a keyword (any string
can be used) for special System purpose
example: ""
type: string
vm:
items:
$ref: '#/definitions/mcis.TbVmDynamicReq'
$ref: '#/definitions/mci.TbVmDynamicReq'
type: array
required:
- name
Expand Down Expand Up @@ -143,21 +143,21 @@ definitions:
example: "no"
type: string
label:
description: Label is for describing the mcis in a keyword (any string can
description: Label is for describing the mci in a keyword (any string can
be used)
example: DynamicVM
type: string
name:
example: mcis01
example: mci01
type: string
systemLabel:
description: SystemLabel is for describing the mcis in a keyword (any string
description: SystemLabel is for describing the mci in a keyword (any string
can be used) for special System purpose
example: ""
type: string
vm:
items:
$ref: '#/definitions/mcis.TbVmDynamicReq'
$ref: '#/definitions/mci.TbVmDynamicReq'
type: array
required:
- name
Expand Down Expand Up @@ -429,7 +429,7 @@ definitions:
required:
- os
type: object
mcis.TbVmDynamicReq:
mci.TbVmDynamicReq:
properties:
commonImage:
description: CommonImage is field for id of a image in common namespace
Expand Down Expand Up @@ -470,7 +470,7 @@ definitions:
type: string
subGroupSize:
default: "1"
description: if subGroupSize is (not empty) && (> 0), subGroup will be gernetad.
description: if subGroupSize is (not empty) && (> 0), subGroup will be generated.
VMs will be created accordingly.
example: "3"
type: string
Expand Down
2 changes: 1 addition & 1 deletion conf/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ beetle:
logfile:
# Set log file path (default logfile path: ./log/beetle.log)
path: ./log/beetle.log
maxsize: 10
maxsize: 1000
maxbackups: 3
maxage: 30
compress: false
Expand Down
2 changes: 1 addition & 1 deletion conf/setup.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export BEETLE_SQLITE_PASSWORD=cm_beetle
## Logger configuration
# Set log file path (default logfile path: ./log/beetle.log)
export BEETLE_LOGFILE_PATH=log/beetle.log
export BEETLE_LOGFILE_MAXSIZE=10
export BEETLE_LOGFILE_MAXSIZE=1000
export BEETLE_LOGFILE_MAXBACKUPS=3
export BEETLE_LOGFILE_MAXAGE=30
export BEETLE_LOGFILE_COMPRESS=false
Expand Down
2 changes: 1 addition & 1 deletion conf/template-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ beetle:
logfile:
# Set log file path (default logfile path: ./log/beetle.log)
path: ./log/beetle.log
maxsize: 10
maxsize: 100
maxbackups: 3
maxage: 30
compress: false
Expand Down
2 changes: 1 addition & 1 deletion conf/template-setup.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export BEETLE_SQLITE_PASSWORD=cm_beetle
## Logger configuration
# Set log file path (default logfile path: ./beetle.log)
export BEETLE_LOGFILE_PATH=beetle.log
export BEETLE_LOGFILE_MAXSIZE=10
export BEETLE_LOGFILE_MAXSIZE=100
export BEETLE_LOGFILE_MAXBACKUPS=3
export BEETLE_LOGFILE_MAXAGE=30
export BEETLE_LOGFILE_COMPRESS=false
Expand Down
9 changes: 5 additions & 4 deletions deployments/docker-compose/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ services:

# CB-Spider
cb-spider:
image: cloudbaristaorg/cb-spider:0.9.0
# image: cloudbaristaorg/cb-spider:0.9.0
image: cloudbaristaorg/cb-spider:edge
container_name: cb-spider
platform: linux/amd64
ports:
Expand Down Expand Up @@ -103,7 +104,7 @@ services:

# CB-Tumblebug
cb-tumblebug:
image: cloudbaristaorg/cb-tumblebug:0.9.2
image: cloudbaristaorg/cb-tumblebug:0.9.6
container_name: cb-tumblebug
platform: linux/amd64
ports:
Expand Down Expand Up @@ -138,7 +139,7 @@ services:
# - TB_DEFAULT_NAMESPACE=ns01
# - TB_DEFAULT_CREDENTIALHOLDER=admin
# - TB_LOGFILE_PATH=/app/log/tumblebug.log
# - TB_LOGFILE_MAXSIZE=10
- TB_LOGFILE_MAXSIZE=1000
# - TB_LOGFILE_MAXBACKUPS=3
# - TB_LOGFILE_MAXAGE=30
# - TB_LOGFILE_COMPRESS=false
Expand Down Expand Up @@ -201,7 +202,7 @@ services:

# cb-mapui (optionally use)
cb-mapui:
image: cloudbaristaorg/cb-mapui:0.9.0
image: cloudbaristaorg/cb-mapui:0.9.3
container_name: cb-mapui
ports:
- target: 1324
Expand Down
Loading