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.

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

Add changes on production environment #2647

Merged
merged 28 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9e5a9d0
fix(orb-ui): Improve policy view header positioning (#2597)
joao-mendonca-encora Aug 31, 2023
c258620
fix(orb-ui): #1096 Update Matching agent styles (#2596)
joao-mendonca-encora Aug 31, 2023
c62c2d8
fix(orb-ui): #124 center align agent key (#2595)
joao-mendonca-encora Aug 31, 2023
1b3bf23
fix(maestro): increase log tail on otel-collectors.
Aug 31, 2023
c2c7f36
improvement(orb-ui): #1095 Add Group page style and design (#2601)
joao-mendonca-encora Aug 31, 2023
5159884
fix(orb-ui): Adjustments on agent key window, command with config fil…
joao-mendonca-encora Aug 31, 2023
78cfa0f
Merge pull request #2600 from lpegoraro/fix/maestro_tail_log_lines
lpegoraro Aug 31, 2023
da7e998
feat(orb-ui): #1106 Agent View, include provisioning command with con…
joao-mendonca-encora Sep 1, 2023
3e81340
improvement(orb-ui): #1108 Update input and forms styles according to…
joao-mendonca-encora Sep 1, 2023
b2513db
fix(orb-ui): align itens agent key (#2606)
joao-mendonca-encora Sep 4, 2023
4a75c64
feat(orb-ui): #1110 New profile page (#2615)
joao-mendonca-encora Sep 5, 2023
0fe6e90
fix(orb-ui): #1097 hide empty description fields and messages on tabl…
joao-mendonca-encora Sep 6, 2023
45c4d87
feat(orb-ui): #1127 Active polling control (#2616)
joao-mendonca-encora Sep 7, 2023
5504cb5
fix(orb-ui): User being log out after change password fail (#2617)
joao-mendonca-encora Sep 7, 2023
c917191
feat(orb-ui): #1140 Add option to configure polling interval (#2618)
joao-mendonca-encora Sep 11, 2023
90607b9
improvement(orb-ui): Include view password button, reset input field …
joao-mendonca-encora Sep 11, 2023
da873fb
fix(orb-ui): Remove duplicated logic on policy view polling control (…
joao-mendonca-encora Sep 11, 2023
8e763a9
fix(orb-ui): Minor fixes and updates (#2622)
joao-mendonca-encora Sep 11, 2023
cc7a026
fix(orb-ui): Improve poll control (#2629)
joao-mendonca-encora Sep 13, 2023
9f4384b
fix(orb-ui): Dataset table, add messages on empty table cell (#2628)
joao-mendonca-encora Sep 13, 2023
8a1b08d
fix(orb-ui): #1177 Policy Add page improvements (#2630)
joao-mendonca-encora Sep 14, 2023
34a42e8
hotfix(eng-1189): Fix Orb Agent Docker command typo (#2632)
gpazuch Sep 18, 2023
cbaa4b7
feat(orb-ui): #eng-1186 improvements on assigned groups component (#2…
joao-mendonca-encora Sep 18, 2023
f61aada
feat(orb-ui): #1185 Search by name on list pages (#2633)
joao-mendonca-encora Sep 18, 2023
d4283ca
fix(orb-ui): Policy add stepper styles (#2635)
joao-mendonca-encora Sep 20, 2023
ba4247d
feat(orb-ui): #1190 Loading Animation (#2634)
joao-mendonca-encora Sep 20, 2023
4f7953b
fix(orb-ui): Yaml as main and only sink config language (#2644)
joao-mendonca-encora Sep 20, 2023
4750f3e
fixes(orb-ui): Polling stopping | resquest button disabled (#2645)
joao-mendonca-encora Sep 21, 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
2 changes: 1 addition & 1 deletion maestro/monitor/monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func (svc *monitorService) Start(ctx context.Context, cancelFunc context.CancelF
}

func (svc *monitorService) getPodLogs(ctx context.Context, pod k8scorev1.Pod) ([]string, error) {
maxTailLines := int64(1)
maxTailLines := int64(10)
sinceSeconds := int64(300)
podLogOpts := k8scorev1.PodLogOptions{TailLines: &maxTailLines, SinceSeconds: &sinceSeconds}
config, err := rest.InClusterConfig()
Expand Down
87 changes: 85 additions & 2 deletions ui/src/app/@theme/styles/_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,13 @@
&online, &healthy {
color: #6fcf97;
}
&stale, &none {
&stale {
color: #f2994a;
}
&error, &failure {
color: #df316f;
}
&offline {
&offline, &none {
color: #969fb9;
}
}
Expand Down Expand Up @@ -264,4 +264,87 @@
text-transform: none !important;
width: 110px;
background-color: #df316f !important;
opacity: 0;
animation: appear 0.3s forwards;
}

@keyframes appear {
0% {
opacity: 0;
transform: translateY(-10px);
}
100% {
opacity: 1;
transform: translateY(0);
}
}
p {
font-family: 'Montserrat' !important;
}
button {
font-family: 'Montserrat' !important;
}
label {
font-family: 'Montserrat' !important;
}
.input-label {
color: #fff !important;
font-size: 14px !important;
font-weight: 500 !important;
}
input {
background-color: transparent !important;
}
.next-button {
border-radius: 16px !important;
background: #3089FC !important;
padding: 8px 24px !important;
color: #fff !important;
border: none !important;
outline: none !important;
font-size: 14px !important;
font-weight: 600 !important;
transition: background-color 0.3s ease !important;
}
.next-button:hover {
background-color: #509afc!important;
}
.next-button:disabled {
background: #2b3148 !important;
}
.cancel-back-button {
border-radius: 16px !important;;
padding: 8px 24px !important;
background-color: transparent !important;
color: #3089FC !important;
border: none !important;
outline: none !important;
font-size: 14px !important;
font-weight: 600 !important;
transition: background-color 0.3s ease !important;
margin-right: 0 !important;
}
.cancel-back-button:hover {
background-color: rgba(255, 255, 255, 0.05) !important;
}
.loading-spinner {
position: absolute;
top: 45%;
left: 50%;
transform: translate(-50%, -50%);
width: 40px;
height: 40px;
border-radius: 50%;
border: 5px solid #404a70;
border-top: 5px solid #21316e;
animation: spin 1s linear infinite;
}

@keyframes spin {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
5 changes: 4 additions & 1 deletion ui/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ import {
NbInputModule,
NbLayoutModule,
NbMenuModule,
NbSelectModule,
NbSidebarModule,
NbToastrModule,
NbTooltipModule,
NbWindowModule,
} from '@nebular/theme';

Expand All @@ -50,7 +52,8 @@ import { CodeEditorService } from 'app/common/services/code.editor.service';
HttpClientModule,

AppRoutingModule,

NbTooltipModule,
NbSelectModule,
ThemeModule.forRoot(),
NbSidebarModule.forRoot(),
NbMenuModule.forRoot(),
Expand Down
3 changes: 2 additions & 1 deletion ui/src/app/auth/auth.token.interceptor.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ export class TokenInterceptor implements HttpInterceptor {
err instanceof HttpErrorResponse &&
err.status === 401 &&
!request.url.startsWith(environment.httpAdapterUrl) &&
!request.url.startsWith(environment.readerUrl)
!request.url.startsWith(environment.readerUrl) &&
(!request.url.endsWith('/password') && request.method !== 'PATCH')
) {
localStorage.removeItem('auth_app_token');
this.router.navigateByUrl('/auth/login');
Expand Down
1 change: 0 additions & 1 deletion ui/src/app/common/services/code.editor.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export class CodeEditorService {

checkEmpty (object) {
for (let key in object) {
console.log(object[key]);
if (object[key] === "" || typeof object[key] === "undefined" || object[key] === null) {
return true;
}
Expand Down
4 changes: 4 additions & 0 deletions ui/src/app/common/services/filter.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ export class FilterService {
}
}

removeFilterByParam(param: string) {
this.removeFilter(this._filters.findIndex((filter) => filter.param === param && filter.name === 'Name' && filter));
}

// make a decorator out of this?
createFilteredList() {
return (
Expand Down
Loading
Loading