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

Merge release into master #1322

Merged
merged 64 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
4b0445a
feat: aws lambda integration
Azanul Nov 28, 2023
d1861c9
fix: go.mod
Azanul Nov 28, 2023
96ac484
Merge branch 'develop' into cost-explorer-api
Azanul Nov 28, 2023
ee54c73
fix: go.mod
Azanul Nov 28, 2023
f5a00f8
fix: incorrect costexplorerOutputList
Azanul Nov 29, 2023
070bb49
Merge branch 'develop' into cost-explorer-api
Azanul Nov 30, 2023
ad3d105
refactor: util for reuse
Azanul Dec 4, 2023
629df9a
fix(1205): Resource fetching performance improvement for OVH
tanbirali Nov 16, 2023
d344687
Update civo.mdx
jakepage91 Nov 21, 2023
cad8aff
fix: Resource fetching performance improvement for Scaleway (#1212)
tanbirali Nov 21, 2023
70a1231
[KOM-38]: Resource fetching performance improvement for CIVO, Digital…
bishal7679 Nov 21, 2023
9f818e9
fix: no OVH in docs (#1218)
Azanul Nov 21, 2023
6b03062
Update hello-to-new-contributors.yml
AvineshTripathi Nov 22, 2023
e656f97
[FEAT-1092]: Update color names and box-shadows to match Design-Syste…
umrkhn Nov 23, 2023
74a8a0b
feat: add aws codebuild resource (#1216)
AmalRichwin Nov 26, 2023
a24452b
feat: add aws codedeploy resource (#1228)
VanshulB Nov 27, 2023
13445cb
Fix accidental loop capture (#1252)
Azanul Nov 30, 2023
ebef48d
feat: add aws codecommit resource (#1229)
AmalRichwin Dec 1, 2023
6e1e34d
Check for nil VpcId and SubnetId before use (#1254)
codekoala Dec 1, 2023
1109af2
Migration Nextjs 13 to 14 (#1217)
shivam-sharma7 Dec 4, 2023
b98b250
Merge branch 'tailwarden:develop' into develop
Azanul Dec 6, 2023
cfc003f
Merge branch 'develop' into cost-explorer-api
Azanul Dec 8, 2023
9ce0b12
feat: cache costexplorer output
Azanul Dec 12, 2023
1cd2c37
feat: cache costexplorer output last 6 months
Azanul Dec 14, 2023
86d062d
feat: cache costexplorer output last 6 months ending last month
Azanul Dec 14, 2023
cfce116
fix: disregard region
Azanul Dec 14, 2023
214ab21
fix: use latest costs
Azanul Dec 14, 2023
c957c11
Merge branch 'develop' into cost-explorer-api
Azanul Dec 14, 2023
5e6e5f3
Merge branch 'tailwarden:develop' into develop
Azanul Dec 14, 2023
926184f
feat: create default config.toml instead of error
Azanul Dec 14, 2023
2cc7aa7
fix: create default config.toml instead of error
Azanul Dec 14, 2023
8bc5d24
Merge branch 'develop' into onboarding-wizard
Azanul Dec 15, 2023
a8d0fee
fix: browser saving confidential data
Azanul Dec 15, 2023
e1fe538
Merge branch 'develop' into cost-explorer-api
Azanul Dec 25, 2023
e0868b4
chore(deps-dev): bump @adobe/css-tools from 4.3.1 to 4.3.2 in /dashboard
dependabot[bot] Dec 27, 2023
66a590d
Update CODEOWNERS
AvineshTripathi Dec 28, 2023
130e0a0
Add metadata to RDS resources
alileza Dec 29, 2023
b06a409
feat(dashboard): add metadata display to InventorySidePanel
alileza Dec 29, 2023
71f88b1
feat(ui): add new group-by option
syedbarimanjan Jan 1, 2024
33c25ed
feat(ui): add group-by-resource state to cost explorer widget
syedbarimanjan Jan 1, 2024
a8a8c1f
style: remove console logs
syedbarimanjan Jan 1, 2024
6eb8f2e
Merge branch 'develop' into feature/1272-add-new-group-by-option-in-c…
Azanul Jan 2, 2024
421f3fa
@variants directive has been deprecated (#1307)
shivam-sharma7 Jan 2, 2024
6792efe
Fix typo in triggerFetchingWorkflow function (#1304)
alileza Jan 2, 2024
d871f07
Merge branch 'develop' into add-metadata
Azanul Jan 2, 2024
903bce3
Merge branch 'develop' into feature/1272-add-new-group-by-option-in-c…
Azanul Jan 3, 2024
0a3c3ed
Update auto_backups.go
alileza Jan 3, 2024
0cdf11b
Merge branch 'develop' into onboarding-wizard
Azanul Jan 4, 2024
2a57179
Setup postgresSQL16 docker image (#1311)
shivam-sharma7 Jan 4, 2024
40b196e
Merge branch 'develop' into feature/1272-add-new-group-by-option-in-c…
mlabouardy Jan 4, 2024
93330f3
Merge pull request #1308 from syedbarimanjan/feature/1272-add-new-gro…
mlabouardy Jan 4, 2024
b414678
Merge branch 'develop' into add-metadata
mlabouardy Jan 4, 2024
19eaeae
Merge pull request #1305 from alileza/add-metadata
mlabouardy Jan 4, 2024
b6b1c88
Merge branch 'develop' into dependabot/npm_and_yarn/dashboard/adobe/c…
mlabouardy Jan 4, 2024
f07da3c
Merge pull request #1303 from AvineshTripathi/owner-update
mlabouardy Jan 4, 2024
3af554b
Merge pull request #1280 from Azanul/cost-explorer-api
mlabouardy Jan 4, 2024
6c00c48
feat: db first then cloud provider
Azanul Jan 5, 2024
72ff8a1
lint: logrus
Azanul Jan 5, 2024
ec9e835
Merge pull request #1256 from tailwarden/dependabot/npm_and_yarn/dash…
mlabouardy Jan 5, 2024
39db86e
Set timezone and limit for dependabot PR (#1312)
shivam-sharma7 Jan 5, 2024
670a574
feat: fetch resources on cloud account creation
Azanul Jan 8, 2024
9ca2703
Merge branch 'develop' into onboarding-wizard
Azanul Jan 8, 2024
ef29f84
Merge pull request #1285 from Azanul/onboarding-wizard
mlabouardy Jan 8, 2024
b47016f
Merge remote-tracking branch 'origin/develop' into merge-release-into…
Azanul Jan 9, 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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* @mlabouardy @ShubhamPalriwala @AvineshTripathi @greghub @Traxmaxx @Kolawole9 @Azanul @jakepage91
* @mlabouardy @ShubhamPalriwala @AvineshTripathi @greghub @Traxmaxx @Kolawole99 @Azanul @jakepage91
docs @jakepage91
README.md @jakepage91
CONTRIBUTING.md @jakepage91
8 changes: 6 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ updates:
directory: "/dashboard"
schedule:
interval: "weekly"
time: "23:00"
timezone: Europe/London
labels:
- "npm dependencies"
- "dependencies"
open-pull-requests-limit: 10
reviewers:
- "mlabouardy"
- "ShubhamPalriwala"
- "Azanul"
- "AvineshTripathi"

16 changes: 16 additions & 0 deletions cmd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package cmd

import (
"errors"
"os"
"path/filepath"
"time"

"github.com/getsentry/sentry-go"
Expand Down Expand Up @@ -31,7 +33,21 @@ var startCmd = &cobra.Command{
if file == "" {
return errors.New("you must specify a config file with '--config PATH'")
}
if file == "config.toml" {
filename, err := filepath.Abs(file)
if err != nil {
return err
}

if _, err := os.Stat(filename); errors.Is(err, os.ErrNotExist) {
log.Info("unable to use given config file:", err)
log.Info("Creating default config.toml")
err = os.WriteFile("config.toml", []byte{}, 0644)
if err != nil {
return err
}
}
}
regions, err := cmd.Flags().GetStringArray("regions")
if err != nil {
return err
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,39 @@ function DashboardCostExplorerCard({
<div className="mt-8"></div>
<div className="h-full min-h-[22rem]">
{chartData && <Bar data={chartData} options={options} />}
{!chartData && (
{/* ⤵ will be removed when cost is supported at Resource level */}
{queryGroup === 'Resource' && (
<div className="relative flex flex-col items-center bg-empty-cost-explorer h-[330px] w-full">
<div className="mt-10 text-lg text-black-900 border border-gray-200 px-8 py-6 flex bg-white">
<div>
<p className="text-lg">
Cost at resource level not yet supported
</p>
<p className="text-sm text-gray-400 mb-4">
We recommend our cloud version, Tailwarden, <br />
as it supports accurate costs at the resource level
</p>

<Button
size="sm"
gap="md"
asLink
href="https://tailwarden.com/?utm_source=komiser"
target="_blank"
>
<CloudIcon width="24" /> Discover Tailwarden
</Button>
</div>
<Image
src="/assets/img/purplin/rocket.svg"
alt="Purplin on a Rocket"
width="115"
height="124"
/>
</div>
</div>
)}
{!chartData && queryGroup !== 'Resource' && (
<div className="relative flex flex-col items-center bg-empty-cost-explorer h-[330px] w-full">
<div className="mt-10 text-lg text-black-900 border border-gray-200 px-8 py-6 flex bg-white">
<div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ export type CostExplorerQueryGroupProps =
| 'service'
| 'region'
| 'account'
| 'view';
| 'view'
| 'Resource';
export type CostExplorerQueryGranularityProps = 'monthly' | 'daily';
export type CostExplorerQueryDateProps =
| 'thisMonth'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,13 @@ function useCostExplorerChart({
}; */

const groupBySelect: GroupBySelectProps = {
values: ['provider', 'service', 'region', 'account'],
values: ['provider', 'service', 'region', 'account','Resource'],
displayValues: [
'Cloud provider',
'Cloud service',
'Cloud region',
'Cloud account'
'Cloud account',
'Resource'
]
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ export type ResourcesManagerQuery =
| 'service'
| 'region'
| 'account'
| 'view';
| 'view'
| 'Resource';

export type ResourcesManagerGroupBySelectProps = {
values: ResourcesManagerQuery[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,23 @@ function InventorySidePanel({
)}
</h2>
</div>
{data && data.metadata !== null && (
<div className="space-y-2">
<h2 className="font-['Noto Sans'] text-neutral-500 text-sm font-normal leading-tight">
Metadata
</h2>
<h2 className="font-['Noto Sans'] text-neutral-900 text-sm font-normal leading-tight">
{!data && (
<p className="h-3 w-48 animate-pulse rounded-xl bg-cyan-200"></p>
)}
{data && (
<pre>
{JSON.stringify(data.metadata, null, 2)}
</pre>
)}
</h2>
</div>
)}
</div>
</SidepanelPage>
)}
Expand Down
2 changes: 1 addition & 1 deletion dashboard/components/layout/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function Layout({ children }: LayoutProps) {
title="We could not find a cloud account"
message="Get Started Onboarding"
action={() => {
router.push('/onboarding/choose-cloud');
router.push('/onboarding/choose-database');
}}
actionLabel="Begin Onboarding"
secondaryAction={() => {
Expand Down
1 change: 1 addition & 0 deletions dashboard/components/onboarding-wizard/LabelledInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ function LabelledInput({
}`}
onChange={onChange}
defaultValue={value}
autoComplete="off"
/>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion dashboard/components/select/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ function Select({
function toggle() {
setIsOpen(!isOpen);
}

return (
<div className="relative">
<div
Expand Down
36 changes: 8 additions & 28 deletions dashboard/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dashboard/pages/onboarding/cloud-accounts/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export default function CloudAccounts() {
))}
</div>
<div className="fixed bottom-0 -mx-20 flex w-[calc(100%*6/11)] justify-end border-t border-gray-300 bg-white px-20 py-4">
<Button onClick={() => router.push('/onboarding/choose-database')}>
<Button onClick={() => router.push('/onboarding/complete')}>
Next
</Button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion dashboard/pages/onboarding/database/postgres.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default function PostgreSQLCredentials() {
message:
'Your Postgres database has been successfully connected to Komiser.'
});
router.push('/onboarding/complete/');
router.push('/onboarding/choose-cloud/');
}
});
};
Expand Down
2 changes: 1 addition & 1 deletion dashboard/pages/onboarding/database/sqlite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default function SqliteCredentials() {
message:
'Your Postgres database has been successfully connected to Komiser.'
});
router.push('/onboarding/complete/');
router.push('/onboarding/choose-cloud/');
}
});
};
Expand Down
Loading
Loading